diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 568a5ff96c14..a952a61e1d15 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -15,6 +15,7 @@ use App;
 use App\Factory\ClientContactFactory;
 use App\Factory\VendorContactFactory;
 use App\Jobs\Company\CreateCompanyToken;
+use App\Libraries\MultiDB;
 use App\Models\Account;
 use App\Models\BankTransaction;
 use App\Models\Client;
@@ -128,6 +129,7 @@ class CheckData extends Command
         $this->checkUserState();
         $this->checkContactEmailAndSendEmailStatus();
         $this->checkPaymentCurrency();
+        $this->checkSubdomainsSet();
 
         if (Ninja::isHosted()) {
             $this->checkAccountStatuses();
@@ -1019,6 +1021,23 @@ class CheckData extends Command
         }
     }
 
+    public function checkSubdomainsSet()
+    {
+        if(Ninja::isSelfHost())
+            return;
+
+        Company::query()
+        ->whereNull('subdomain')
+        ->orWhere('subdomain', '')
+        ->cursor()
+        ->each(function ($c){
+
+            $c->subdomain = MultiDB::randomSubdomainGenerator();
+            $c->save();
+            
+        });
+    }
+
     public function checkPaymentCurrency()
     {
         $p = Payment::with('company','client')