diff --git a/app/Console/Commands/BackupUpdate.php b/app/Console/Commands/BackupUpdate.php
index a2fc126e9264..9a827b68d19a 100644
--- a/app/Console/Commands/BackupUpdate.php
+++ b/app/Console/Commands/BackupUpdate.php
@@ -11,11 +11,12 @@
 
 namespace App\Console\Commands;
 
-use App\Libraries\MultiDB;
+use App\Utils\Ninja;
 use App\Models\Backup;
 use App\Models\Client;
 use App\Models\Company;
 use App\Models\Document;
+use App\Libraries\MultiDB;
 use App\Models\GroupSetting;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
@@ -55,6 +56,9 @@ class BackupUpdate extends Command
     {
         //always return state to first DB
 
+        if(Ninja::isSelfHost())
+            return;
+            
         $current_db = config('database.default');
 
         if (! config('ninja.db.multi_db_enabled')) {
diff --git a/app/Services/Email/Email.php b/app/Services/Email/Email.php
index 40041fc984a6..ddbfee25fb92 100644
--- a/app/Services/Email/Email.php
+++ b/app/Services/Email/Email.php
@@ -329,8 +329,13 @@ class Email implements ShouldQueue
      */
     public function preFlightChecksFail(): bool
     {
+        /* Always send if disabled */
+        if($this->override) {
+            return false;
+        }
+
         /* If we are migrating data we don't want to fire any emails */
-        if ($this->company->is_disabled && !$this->override) {
+        if ($this->company->is_disabled) {
             return true;
         }