diff --git a/app/Services/TemplateService.php b/app/Services/TemplateService.php
index c2dda7ed5428..79f47d317db9 100644
--- a/app/Services/TemplateService.php
+++ b/app/Services/TemplateService.php
@@ -57,8 +57,8 @@ class TemplateService
             '$idNumber' => $client->id_number,
             '$vatNumber' => $client->vat_number,
             '$account' => $account->getDisplayName(),
-            '$dueDate' => $account->formatDate($invoice->partial_due_date ?: $invoice->due_date),
-            '$invoiceDate' => $account->formatDate($invoice->invoice_date),
+            '$dueDate' => $account->formatDate($invoice->getOriginal('partial_due_date') ?: $invoice->getOriginal('due_date')),
+            '$invoiceDate' => $account->formatDate($invoice->getOriginal('invoice_date')),
             '$contact' => $contact->getDisplayName(),
             '$firstName' => $contact->first_name,
             '$amount' => $account->formatMoney($amount, $client),