diff --git a/app/Models/Traits/GeneratesNumbers.php b/app/Models/Traits/GeneratesNumbers.php
index ec4c832f5c92..edb940a2328d 100644
--- a/app/Models/Traits/GeneratesNumbers.php
+++ b/app/Models/Traits/GeneratesNumbers.php
@@ -24,6 +24,10 @@ trait GeneratesNumbers
         $counterOffset = 0;
         $check = false;
 
+        if ($entityType == ENTITY_CLIENT && ! $this->clientNumbersEnabled()) {
+            return '';
+        }
+
         // confirm the invoice number isn't already taken
         do {
             if ($this->hasNumberPattern($entityType)) {
diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php
index 67a51feb1bdc..46deaf9373bb 100644
--- a/resources/views/accounts/invoice_settings.blade.php
+++ b/resources/views/accounts/invoice_settings.blade.php
@@ -135,7 +135,7 @@
                                     ->label(trans('texts.counter'))
                                     ->addGroupClass('pad-checkbox')
                                     ->help(trans('texts.client_number_help') . ' ' .
-                                        trans('texts.next_client_number', ['number' => $account->getNextNumber()])) !!}
+                                        trans('texts.next_client_number', ['number' => $account->getNextNumber() ?: '0001'])) !!}
 
                         </div>
                     </div>