diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index e39ee1ebb634..f7880f9c60f1 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -384,12 +384,12 @@ class InvoiceRepository extends BaseRepository
             }
         }
 
-        $invoice->fill($data);
-
-        if (! $invoice->invoice_design_id) {
-            $invoice->invoice_design_id = 1;
+        if (isset($data['invoice_design_id']) && ! $data['invoice_design_id']) {
+            $data['invoice_design_id'] = 1;
         }
 
+        $invoice->fill($data);
+
         if ((isset($data['set_default_terms']) && $data['set_default_terms'])
             || (isset($data['set_default_footer']) && $data['set_default_footer'])) {
             if (isset($data['set_default_terms']) && $data['set_default_terms']) {