diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 6364dc6b1856..ff4aa5f88682 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -115,13 +115,13 @@
     							->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))
                                 ->appendIcon('calendar')
                                 ->addGroupClass('start_date')
-                                ->data_date_start_date($account->formatDate($account->getDateTime())) !!}
+                                ->data_date_start_date($expense ? false : $account->formatDate($account->getDateTime())) !!}
                         {!! Former::text('end_date')
                                 ->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")
     							->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))
                                 ->appendIcon('calendar')
                                 ->addGroupClass('end_date')
-                                ->data_date_start_date($account->formatDate($account->getDateTime())) !!}
+                                ->data_date_start_date($expense ? false : $account->formatDate($account->getDateTime())) !!}
 
                     @else
                         @if ((! $expense || ! $expense->transaction_id))
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index cef1eb0cf7cb..804ba41f858e 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -216,9 +216,9 @@
 			<div data-bind="visible: is_recurring" style="display: none">
 				{!! Former::select('frequency_id')->label('frequency')->options($frequencies)->data_bind("value: frequency_id")
                         ->appendIcon('question-sign')->addGroupClass('frequency_id')->onchange('onFrequencyChange()') !!}
-				{!! Former::text('start_date')->data_bind("datePicker: start_date, valueUpdate: 'afterkeydown'")->data_date_start_date($account->formatDate($account->getDateTime()))
+				{!! Former::text('start_date')->data_bind("datePicker: start_date, valueUpdate: 'afterkeydown'")->data_date_start_date($invoice->id ? false : $account->formatDate($account->getDateTime()))
 							->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('start_date') !!}
-				{!! Former::text('end_date')->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")->data_date_start_date($account->formatDate($account->getDateTime()))
+				{!! Former::text('end_date')->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")->data_date_start_date($invoice->id ? false : $account->formatDate($account->getDateTime()))
 							->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('end_date') !!}
                 {!! Former::select('recurring_due_date')->label(trans('texts.due_date'))->options($recurringDueDates)->data_bind("value: recurring_due_date")->appendIcon('question-sign')->addGroupClass('recurring_due_date') !!}
 			</div>