diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 08b1987323dc..1319a6d756a4 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -223,6 +223,9 @@ class InvoiceRepository extends BaseRepository
         if (isset($data['invoice_number']) && !$invoice->is_recurring) {
             $invoice->invoice_number = trim($data['invoice_number']);
         }
+        elseif (!isset($data['invoice_number']) && !$invoice->is_recurring) {
+            $invoice->invoice_number = $account->getNextInvoiceNumber($invoice);
+        }
 
         if (isset($data['discount'])) {
             $invoice->discount = round(Utils::parseFloat($data['discount']), 2);
diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php
index eed474346550..e3629671de46 100644
--- a/app/Ninja/Transformers/AccountTransformer.php
+++ b/app/Ninja/Transformers/AccountTransformer.php
@@ -13,7 +13,7 @@ class AccountTransformer extends EntityTransformer
     protected $defaultIncludes = [
         'users',
     //    'clients',
-        'invoices',
+    //    'invoices',
         'products',
         'taxRates'
     ];