diff --git a/sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Utils/GiftAid.php b/sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Utils/GiftAid.php
index 95145519e4bb..a654e38dfafd 100644
--- a/sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Utils/GiftAid.php
+++ b/sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Utils/GiftAid.php
@@ -447,7 +447,8 @@ static function isContributionSubmitted($contributionID) {
 
       $dao = CRM_Core_DAO::executeQuery( $sql, $sqlParams );
 
-      if(!count($dao->fetchAll())) {
+      $count = count($dao->fetchAll());
+      if(!$count || $dao->eligible_for_gift_aid == 0) {
         return FALSE;
       }
       return TRUE;