diff --git a/app/Http/ValidationRules/ValidCreditsPresentRule.php b/app/Http/ValidationRules/ValidCreditsPresentRule.php
index 5cb77a680ed8..ac62328aede5 100644
--- a/app/Http/ValidationRules/ValidCreditsPresentRule.php
+++ b/app/Http/ValidationRules/ValidCreditsPresentRule.php
@@ -46,10 +46,9 @@ class ValidCreditsPresentRule implements Rule
 
         if (request()->input('credits') && is_array(request()->input('credits'))) {
             $credit_collection = Credit::whereIn('id', $this->transformKeys(array_column(request()->input('credits'), 'credit_id')))
-                                       ->where('balance', '>', 0)
-                                       ->get();
+                                       ->count();
 
-            return $credit_collection->count() == count(request()->input('credits'));
+            return $credit_collection == count(request()->input('credits'));
         }
 
         return true;
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index f623574ebd76..651737fd8393 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -156,6 +156,7 @@ class PaymentRepository extends BaseRepository {
                 $credit = Credit::withTrashed()->find($this->decodePrimaryKey($paid_credit['credit_id']));
 
                 if ($credit) {
+                    $credit = $credit->service()->markSent()->save();
                     ApplyCreditPayment::dispatchNow($credit, $payment, $paid_credit['amount'], $credit->company);
                 }
             }