diff --git a/app/Ninja/Reports/DocumentReport.php b/app/Ninja/Reports/DocumentReport.php
index d7563d329ce7..c87408731923 100644
--- a/app/Ninja/Reports/DocumentReport.php
+++ b/app/Ninja/Reports/DocumentReport.php
@@ -50,7 +50,7 @@ class DocumentReport extends AbstractReport
             $zip = Archive::instance_by_useragent(date('Y-m-d') . '_' . str_replace(' ', '_', trans('texts.documents')));
             foreach ($records as $record) {
                 foreach ($record->documents as $document) {
-                    $name = sprintf('%s_%s_%s', date('Y-m-d'), $record->present()->titledName, $document->name);
+                    $name = sprintf('%s_%s_%s', $document->created_at->format('Y-m-d'), $record->present()->titledName, $document->name);
                     $name = str_replace(' ', '_', $name);
                     $name = str_replace('#', '', $name);
                     $zip->add_file($name, $document->getRaw());
diff --git a/app/Ninja/Reports/ExpenseReport.php b/app/Ninja/Reports/ExpenseReport.php
index 8457d7079b06..788b33908ee8 100644
--- a/app/Ninja/Reports/ExpenseReport.php
+++ b/app/Ninja/Reports/ExpenseReport.php
@@ -39,7 +39,7 @@ class ExpenseReport extends AbstractReport
             foreach ($expenses->get() as $expense) {
                 foreach ($expense->documents as $document) {
                     $expenseId = str_pad($expense->public_id, $account->invoice_number_padding, '0', STR_PAD_LEFT);
-                    $name = sprintf('%s_%s_%s_%s', date('Y-m-d'), trans('texts.expense'), $expenseId, $document->name);
+                    $name = sprintf('%s_%s_%s_%s', $expense->expense_date ?: date('Y-m-d'), trans('texts.expense'), $expenseId, $document->name);
                     $name = str_replace(' ', '_', $name);
                     $zip->add_file($name, $document->getRaw());
                 }
diff --git a/app/Ninja/Reports/InvoiceReport.php b/app/Ninja/Reports/InvoiceReport.php
index f8f5e24ffa4b..54b5353e9cf4 100644
--- a/app/Ninja/Reports/InvoiceReport.php
+++ b/app/Ninja/Reports/InvoiceReport.php
@@ -48,7 +48,7 @@ class InvoiceReport extends AbstractReport
             foreach ($clients->get() as $client) {
                 foreach ($client->invoices as $invoice) {
                     foreach ($invoice->documents as $document) {
-                        $name = sprintf('%s_%s_%s', date('Y-m-d'), $invoice->present()->titledName, $document->name);
+                        $name = sprintf('%s_%s_%s', $invoice->invoice_date ?: date('Y-m-d'), $invoice->present()->titledName, $document->name);
                         $zip->add_file($name, $document->getRaw());
                     }
                 }
diff --git a/app/Ninja/Reports/QuoteReport.php b/app/Ninja/Reports/QuoteReport.php
index 876268c45a3f..d7ed1f0ade76 100644
--- a/app/Ninja/Reports/QuoteReport.php
+++ b/app/Ninja/Reports/QuoteReport.php
@@ -42,7 +42,7 @@ class QuoteReport extends AbstractReport
             foreach ($clients->get() as $client) {
                 foreach ($client->invoices as $invoice) {
                     foreach ($invoice->documents as $document) {
-                        $name = sprintf('%s_%s_%s', date('Y-m-d'), $invoice->present()->titledName, $document->name);
+                        $name = sprintf('%s_%s_%s', $invoice->invoice_date ?: date('Y-m-d'), $invoice->present()->titledName, $document->name);
                         $name = str_replace(' ', '_', $name);
                         $zip->add_file($name, $document->getRaw());
                     }