diff --git a/airdrop/application/services/user_registration_services.py b/airdrop/application/services/user_registration_services.py
index d9f8432..2111bac 100644
--- a/airdrop/application/services/user_registration_services.py
+++ b/airdrop/application/services/user_registration_services.py
@@ -182,6 +182,15 @@ def eligibility_v2(inputs: dict) -> tuple:
                     )
                 )
 
+            # Temporary fix
+            is_claimed = False
+            for window_data in windows_registration_data[::-1]:
+                if window_data.claim_status == UserClaimStatus.RECEIVED:
+                    is_claimed = True
+                    continue
+                if window_data.claim_status == UserClaimStatus.READY_TO_CLAIM and is_claimed:
+                    window_data.claim_status = UserClaimStatus.RECEIVED
+
             response = airdrop_object.generate_multiple_windows_eligibility_response(
                 is_user_eligible=is_user_eligible,
                 airdrop_id=airdrop_id,