diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 545488b1d3f9..79b618df9108 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -386,12 +386,6 @@ class InvoiceRepository extends BaseRepository
             $invoice->invoice_date = date_create()->format('Y-m-d');
             $invoice->custom_taxes1 = $account->custom_invoice_taxes1 ?: false;
             $invoice->custom_taxes2 = $account->custom_invoice_taxes2 ?: false;
-            if (isset($data['has_tasks']) && filter_var($data['has_tasks'], FILTER_VALIDATE_BOOLEAN)) {
-                $invoice->has_tasks = true;
-            }
-            if (isset($data['has_expenses']) && filter_var($data['has_expenses'], FILTER_VALIDATE_BOOLEAN)) {
-                $invoice->has_expenses = true;
-            }
 
             // set the default due date
             if ($entityType == ENTITY_INVOICE) {
@@ -409,6 +403,13 @@ class InvoiceRepository extends BaseRepository
             return $invoice;
         }
 
+        if (isset($data['has_tasks']) && filter_var($data['has_tasks'], FILTER_VALIDATE_BOOLEAN)) {
+            $invoice->has_tasks = true;
+        }
+        if (isset($data['has_expenses']) && filter_var($data['has_expenses'], FILTER_VALIDATE_BOOLEAN)) {
+            $invoice->has_expenses = true;
+        }
+
         if (isset($data['is_public']) && filter_var($data['is_public'], FILTER_VALIDATE_BOOLEAN)) {
             $invoice->is_public = true;
             if (! $invoice->isSent()) {