diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php
index c212c870fd8b..779c40d82bc2 100644
--- a/app/DataMapper/Tax/BaseRule.php
+++ b/app/DataMapper/Tax/BaseRule.php
@@ -188,7 +188,7 @@ class BaseRule implements RuleInterface
         try {
             return USStates::getState(strlen($this->client->postal_code) > 1 ? $this->client->postal_code : $this->client->shipping_postal_code);
         } catch (\Exception $e) {
-            return 'CA';
+            return $this->client->company->country()->iso_3166_2 == 'US' ? $this->client->company->tax_data->seller_subregion : 'CA';
         }
     }
 
diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php
index af7f3338a536..512fd9a15a4e 100644
--- a/app/Transformers/ClientTransformer.php
+++ b/app/Transformers/ClientTransformer.php
@@ -149,7 +149,7 @@ class ClientTransformer extends EntityTransformer
             'number' => (string) $client->number ?: '',
             'has_valid_vat_number' => (bool) $client->has_valid_vat_number,
             'is_tax_exempt' => (bool) $client->is_tax_exempt,
-            'tax_data' => $client->tax_data ?: '',
+            // 'tax_data' => $client->tax_data ?: '',
         ];
     }
 }
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index 5e3b0a93955d..b76d3d6cfddb 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -149,7 +149,7 @@ class InvoiceTransformer extends EntityTransformer
             'paid_to_date' => (float) $invoice->paid_to_date,
             'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id),
             'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
-            'tax_data' => $invoice->tax_data ?: '',            
+            // 'tax_data' => $invoice->tax_data ?: '',            
         ];
     }
 }