diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 7d6e0814df3c..16ea05ceb235 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -14,6 +14,7 @@ namespace App\Http\Controllers;
 use App\DataMapper\Analytics\AccountDeleted;
 use App\DataMapper\CompanySettings;
 use App\DataMapper\DefaultSettings;
+use App\Factory\CompanyFactory;
 use App\Http\Requests\Company\CreateCompanyRequest;
 use App\Http\Requests\Company\DefaultCompanyRequest;
 use App\Http\Requests\Company\DestroyCompanyRequest;
@@ -229,9 +230,13 @@ class CompanyController extends BaseController
             'permissions' => '',
             'settings' => null,
             'notifications' => CompanySettings::notificationDefaults(),
-            //'settings' => DefaultSettings::userSettings(),
         ]);
 
+        if(auth()->user()->company()->account->companies()->where('is_large', 1)->exists())
+        {
+            $company->account->companies()->update(['is_large' => true]);
+        }
+
         /*
          * Required dependencies
          */
@@ -417,7 +422,6 @@ class CompanyController extends BaseController
         if ($request->hasFile('company_logo') || (is_array($request->input('settings')) && !array_key_exists('company_logo', $request->input('settings')))) 
             $this->removeLogo($company);
         
-
         $company = $this->company_repo->save($request->all(), $company);
 
         $company->saveSettings($request->input('settings'), $company);
diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php
index 79a530d1eb01..def948a3b122 100644
--- a/app/Jobs/Ninja/CompanySizeCheck.php
+++ b/app/Jobs/Ninja/CompanySizeCheck.php
@@ -69,16 +69,5 @@ class CompanySizeCheck implements ShouldQueue
            
          });
 
-        // Company::where('is_large', false)->cursor()->each(function ($company) {
-
-        //     if ($company->invoices()->count() > 500 || $company->products()->count() > 500 || $company->clients()->count() > 500) {
-                
-        //         nlog("Marking company {$company->id} as large");
-
-        //         $company->account->companies->update(['is_large' => true])
-
-        //     }
-            
-        // });
     }
 }