diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php
index bcea2cb8d26e..c68c353475a9 100644
--- a/app/Http/Middleware/TokenAuth.php
+++ b/app/Http/Middleware/TokenAuth.php
@@ -49,7 +49,6 @@ class TokenAuth
             | us to decouple a $user and their attached companies completely.
             |
             */
-            $user->setCompany($company_token->company);
 
             app('queue')->createPayloadUsing(function () use ($company_token) {
                 return ['db' => $company_token->company->db];
@@ -67,6 +66,7 @@ class TokenAuth
 
             //stateless, don't remember the user.
             auth()->login($user, false);
+            auth()->user()->setCompany($company_token->company);
 
         } else {
             $error = [
diff --git a/app/Models/User.php b/app/Models/User.php
index 7df1b242e00c..a4a02e1ac421 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -159,8 +159,6 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     public function setCompany($company)
     {
-        // config(['ninja.company_id' => $company->id]);
-
         $this->company = $company;
     }
 
@@ -170,16 +168,17 @@ class User extends Authenticatable implements MustVerifyEmail
     public function getCompany()
     {
 
-        if (request()->header('X-API-TOKEN')) {
-            $company_token = CompanyToken::with(['company'])->whereRaw('BINARY `token`= ?', [request()->header('X-API-TOKEN')])->first();
-
-            return $company_token->company;
-        }
-        elseif ($this->company){
+        if ($this->company){
 
             return $this->company;
         
         }
+        elseif (request()->header('X-API-TOKEN')) {
+            $company_token = CompanyToken::with(['company'])->whereRaw('BINARY `token`= ?', [request()->header('X-API-TOKEN')])->first();
+
+            return $company_token->company;
+        }
+
 
         // return false;
         throw new \Exception('No Company Found');