diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index f28277815..c639257c7 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -702,7 +702,7 @@ const app = new Vue({
 
         onChangeRecurringDate() {
             let started_at = new Date(this.form.recurring_started_at);
-            let due_at = format(addDays(started_at, this.form.payment_terms), 'yyyy-MM-dd');
+            let due_at = format(addDays(started_at, this.form.payment_terms), 'yyyy-MM-dd hh:mm:ss');
 
             this.form.due_at = due_at;
         },
diff --git a/resources/views/components/documents/form/recurring_metadata.blade.php b/resources/views/components/documents/form/recurring_metadata.blade.php
index 8461bbe2f..482612636 100644
--- a/resources/views/components/documents/form/recurring_metadata.blade.php
+++ b/resources/views/components/documents/form/recurring_metadata.blade.php
@@ -43,11 +43,22 @@
         @stack('due_start')
 
         @if (! $hideDueAt)
+            @php
+            (string) $payment_term = setting($type . '.payment_terms', 0);
+
+            if (($document)) {
+                $payment_term = \Date::parse($document->due_at)->diffInDays(\Date::parse($document->issued_at));
+
+                if ($payment_term > 0) {
+                    $payment_term++;
+                }
+            }
+            @endphp
             <x-form.group.select
                 name="payment_terms"
                 label="{{ trans('invoices.payment_due') }}"
                 :options="$payment_terms"
-                :selected="($document) ? (string) \Date::parse($document->due_at)->diffInDays(\Date::parse($document->issued_at)) : setting($type . '.payment_terms', 0)"
+                :selected="(string) $payment_term"
                 visible-change="onChangeRecurringDate"
             />