diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index dac9921942fe..84a77c49580b 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -131,7 +131,8 @@ class PaymentRepository extends BaseRepository {
 
         /*Ensure payment number generated*/
         if (! $payment->number || strlen($payment->number) == 0) {
-            $payment->number = $payment->client->getNextPaymentNumber($payment->client, $payment);
+            // $payment->number = $payment->client->getNextPaymentNumber($payment->client, $payment);
+            $payment->service()->applyNumber();
         }
 
         /*Set local total variables*/