diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 9c037e92286d..e64bac17a292 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -392,7 +392,7 @@ class InvoiceController extends BaseController
         }
 
         if ($invoice->isLocked()) {
-            return response()->json(['message' => ctrans('texts.locked_invoice')]);
+            return response()->json(['message' => ctrans('texts.locked_invoice')], 403);
         }
 
         $invoice = $this->invoice_repo->save($request->all(), $invoice);
diff --git a/app/Http/Requests/Invoice/ActionInvoiceRequest.php b/app/Http/Requests/Invoice/ActionInvoiceRequest.php
index fbe5c8c9c222..17c27ad7ab90 100644
--- a/app/Http/Requests/Invoice/ActionInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/ActionInvoiceRequest.php
@@ -45,8 +45,6 @@ class ActionInvoiceRequest extends Request
     {
         $input = $this->all();
 
-        $this->invoice = Invoice::find($this->decodePrimary($invoice_id));
-
         if (!array_key_exists('action', $input)) {
             $this->error_msg = 'Action is a required field';
         } elseif (!$this->invoiceDeletable($this->invoice)) {
diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php
index 0a04f8761946..06bdd4db1599 100644
--- a/app/Jobs/Cron/RecurringInvoicesCron.php
+++ b/app/Jobs/Cron/RecurringInvoicesCron.php
@@ -42,6 +42,7 @@ class RecurringInvoicesCron
 
         if (! config('ninja.db.multi_db_enabled')) {
             $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '<=', now())
+                                                        ->whereNotNull('next_send_date')
                                                         ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                         ->where('remaining_cycles', '!=', '0')
                                                         ->with('company')
@@ -62,6 +63,7 @@ class RecurringInvoicesCron
                 MultiDB::setDB($db);
 
                 $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '<=', now())
+                                                        ->whereNotNull('next_send_date')
                                                         ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                         ->where('remaining_cycles', '!=', '0')
                                                         ->with('company')