diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php
index cb1068cc0d14..71300863de23 100644
--- a/app/Jobs/Util/ReminderJob.php
+++ b/app/Jobs/Util/ReminderJob.php
@@ -53,7 +53,11 @@ class ReminderJob implements ShouldQueue
 
     private function processReminders()
     {
-        Invoice::whereDate('next_send_date', '<=', now())->with('invitations')->cursor()->each(function ($invoice) {
+        Invoice::whereDate('next_send_date', '<=', now())
+                 ->where('is_deleted', 0)
+                 ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
+                 ->where('balance', '>', 0)
+                 ->with('invitations')->cursor()->each(function ($invoice) {
 
             if ($invoice->isPayable()) {
                 $reminder_template = $invoice->calculateTemplate('invoice');
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 8ac66ed6c7db..304d83233ea6 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -392,7 +392,8 @@ class InvoiceService
                 $this->invoice->reminder_last_sent = now()->format('Y-m-d');
                 break;
             default:
-                // code...
+                $this->invoice->reminder1_sent = now()->format('Y-m-d');
+                $this->invoice->reminder_last_sent = now()->format('Y-m-d');
                 break;
         }
 
diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 5f2090a4cdc4..f08d873b9dee 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -126,8 +126,11 @@ class UpdateReminder extends AbstractService
                 $date_collection->push($reminder_date); 
         }
 
-        $this->invoice->next_send_date = $date_collection->sort()->first();
-
+        if($date_collection->count() >=1)
+            $this->invoice->next_send_date = $date_collection->sort()->first();
+        else
+            $this->invoice->next_send_date = null;
+        
         return $this->invoice;
     }
 }
\ No newline at end of file