diff --git a/app/Observers/LocationObserver.php b/app/Observers/LocationObserver.php
index 45f19ada97..9aaf1ab6e8 100644
--- a/app/Observers/LocationObserver.php
+++ b/app/Observers/LocationObserver.php
@@ -24,8 +24,8 @@ class LocationObserver
     public function created(Location $location)
     {
        
-        if ($location->client->country_id == 840 && $location->client->company->calculate_taxes && !$location->client->company->account->isFreeHostedClient()) {
-            UpdateLocationTaxData::dispatch($location, $location->client->company);
+        if ($location->country_id == 840 && $location->company->calculate_taxes && !$location->company->account->isFreeHostedClient()) {
+            UpdateLocationTaxData::dispatch($location, $location->company);
         }
 
     }
@@ -39,8 +39,8 @@ class LocationObserver
     public function updated(Location $location)
     {
         
-        if ($location->getOriginal('postal_code') != $location->postal_code && $location->country_id == 840 && $location->client->company->calculate_taxes && !$location->client->company->account->isFreeHostedClient()) {
-            UpdateLocationTaxData::dispatch($location, $location->client->company);
+        if ($location->getOriginal('postal_code') != $location->postal_code && $location->country_id == 840 && $location->company->calculate_taxes && !$location->company->account->isFreeHostedClient()) {
+            UpdateLocationTaxData::dispatch($location, $location->company);
         }
 
     }
diff --git a/database/factories/LocationFactory.php b/database/factories/LocationFactory.php
index 9b0b8fd67a..ca319a6041 100644
--- a/database/factories/LocationFactory.php
+++ b/database/factories/LocationFactory.php
@@ -35,7 +35,7 @@ class LocationFactory extends Factory
             'city' => $this->faker->city(),
             'state' => $this->faker->state(),
             'postal_code' => $this->faker->postcode(),
-            'country_id' => 4,
+            'country_id' => 840,
         ];
     }
 }
diff --git a/tests/Feature/LocationApiTest.php b/tests/Feature/LocationApiTest.php
index 8541da76b9..60a71f0cdf 100644
--- a/tests/Feature/LocationApiTest.php
+++ b/tests/Feature/LocationApiTest.php
@@ -331,6 +331,7 @@ class LocationApiTest extends TestCase
         $location = Location::factory()->create([
             'company_id' => $this->company->id,
             'user_id' => $this->user->id,
+            'country_id' => '840',
         ]);
 
         $response = $this->withHeaders([