diff --git a/app/assets/v2/js/grants/matching_funds.js b/app/assets/v2/js/grants/matching_funds.js
index ac9809edd8e..8a060f6ea6e 100644
--- a/app/assets/v2/js/grants/matching_funds.js
+++ b/app/assets/v2/js/grants/matching_funds.js
@@ -86,6 +86,7 @@ Vue.mixin({
         JSON.parse(document.contxt.match_payouts_abi),
         contractAddress
       );
+      // After payouts are claimed, this will return 0 which updates value of claim_tx
       const amount = await payout_contract.methods.payouts(recipientAddress).call();
 
       if (amount == 0) {
@@ -255,7 +256,9 @@ Vue.mixin({
       return grant.clr_matches.length && grant.clr_matches.filter(a => a.claim_tx).length;
     },
     canClaimMatch(grant) {
-      return grant.clr_matches.length && grant.clr_matches.filter(a => !a.claim_tx).length;
+      return grant.clr_matches.length && grant.clr_matches.filter(
+        a => a.claim_tx === null &&
+        a.grant_payout).length;
     },
     filterMatchingPayout(matches) {
       return matches.filter(match => match.grant_payout);