diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index cf97db87d771..42c71fcd0bd3 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -238,7 +238,8 @@ class BillingPortalPurchase extends Component
     {
         $company = $this->subscription->company;
         $user = $this->subscription->user;
-
+        $user->setCompany($company);
+        
         $client_repo = new ClientRepository(new ClientContactRepository());
 
         $data = [
diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
index cccf3d04d80f..8aec2c5604bf 100644
--- a/app/Repositories/ClientRepository.php
+++ b/app/Repositories/ClientRepository.php
@@ -13,6 +13,7 @@ namespace App\Repositories;
 
 use App\Factory\ClientFactory;
 use App\Models\Client;
+use App\Models\Company;
 use App\Utils\Traits\GeneratesCounter;
 use App\Utils\Traits\SavesDocuments;
 
@@ -59,10 +60,10 @@ class ClientRepository extends BaseRepository
         }
 
         $client->fill($data);
-        
 
-        if(auth()->user() && !$client->country_id){
-            $client->country_id = auth()->user()->company()->settings->country_id;
+        if(!$client->country_id){
+            $company = Company::find($client->company_id);
+            $client->country_id = $company->settings->country_id;
             
         }