diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 44b382a030d0..40962a7ced78 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -139,9 +139,9 @@ class UpdateReminder extends AbstractService
 
         if ($this->invoice->last_sent_date &&
             $this->settings->enable_reminder_endless &&
-            ($this->invoice->reminder1_sent || $this->settings->schedule_reminder1 == "") &&
-            ($this->invoice->reminder2_sent || $this->settings->schedule_reminder2 == "") &&
-            ($this->invoice->reminder3_sent || $this->settings->schedule_reminder3 == "")) {
+            ($this->invoice->reminder1_sent || $this->settings->schedule_reminder1 == "" || !$this->settings->enable_reminder1) &&
+            ($this->invoice->reminder2_sent || $this->settings->schedule_reminder2 == "" || !$this->settings->enable_reminder2) &&
+            ($this->invoice->reminder3_sent || $this->settings->schedule_reminder3 == "" || !$this->settings->enable_reminder3)) {
             $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int) $this->settings->endless_reminder_frequency_id);
 
             if ($reminder_date) {