diff --git a/client/src/ui/modules/Airdrop.tsx b/client/src/ui/modules/Airdrop.tsx
index 4d349c7..86f0ff0 100644
--- a/client/src/ui/modules/Airdrop.tsx
+++ b/client/src/ui/modules/Airdrop.tsx
@@ -68,7 +68,10 @@ const Airdrop = forwardRef<HTMLDivElement, AirdropProps>((props, ref) => {
     }
   }, [account, claimFreeMint, freeGames?.number]);
 
-  if (freeGames && freeGames.number === 0 && !claimStatus.showSuccess) {
+  if (
+    freeGames === null ||
+    (freeGames.number === 0 && !claimStatus.showSuccess)
+  ) {
     return (
       <div
         ref={ref}
diff --git a/contracts/src/helpers/controller.cairo b/contracts/src/helpers/controller.cairo
index eae0478..78be367 100644
--- a/contracts/src/helpers/controller.cairo
+++ b/contracts/src/helpers/controller.cairo
@@ -422,7 +422,7 @@ impl Controller of ControllerTrait {
         let shifted_full_block = BitShift::shl(full_block, shift_bits);
         block_row = block_row | shifted_full_block;
 
-        // assert(Self::check_row_coherence(block_row), errors::CONTROLLER_NOT_COHERENT_LINE);
+        assert(Self::check_row_coherence(block_row), errors::CONTROLLER_NOT_COHERENT_LINE);
 
         // [Return] Updated bitmap
         let bitmap: u256 = blocks.into();
@@ -478,7 +478,7 @@ impl Controller of ControllerTrait {
         let shifted_full_block = BitShift::shr(full_block, shift_bits);
         block_row = block_row | shifted_full_block;
 
-        // assert(Self::check_row_coherence(block_row), errors::CONTROLLER_NOT_COHERENT_LINE);
+        assert(Self::check_row_coherence(block_row), errors::CONTROLLER_NOT_COHERENT_LINE);
 
         // [Return] Updated bitmap
         let bitmap: u256 = blocks.into();