diff --git a/app/DataMapper/Tax/AU/Rule.php b/app/DataMapper/Tax/AU/Rule.php
index d6536e1a71..c1d9e7ed21 100644
--- a/app/DataMapper/Tax/AU/Rule.php
+++ b/app/DataMapper/Tax/AU/Rule.php
@@ -62,7 +62,7 @@ class Rule extends BaseRule implements RuleInterface
     public function taxByType($item): self
     {
 
-        if ($this->client->is_tax_exempt) {
+        if ($this->client->is_tax_exempt || !property_exists($item, 'tax_id')) {
             return $this->taxExempt($item);
         }
 
diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php
index 36635429a6..ba81697345 100644
--- a/app/DataMapper/Tax/BaseRule.php
+++ b/app/DataMapper/Tax/BaseRule.php
@@ -297,7 +297,7 @@ class BaseRule implements RuleInterface
     public function tax($item = null): self
     {
     
-        if ($this->client->is_tax_exempt) {
+        if ($this->client->is_tax_exempt || !property_exists($item, 'tax_id')) {
             
             return $this->taxExempt($item);
 
diff --git a/app/DataMapper/Tax/DE/Rule.php b/app/DataMapper/Tax/DE/Rule.php
index c82f701496..8214188c36 100644
--- a/app/DataMapper/Tax/DE/Rule.php
+++ b/app/DataMapper/Tax/DE/Rule.php
@@ -63,7 +63,7 @@ class Rule extends BaseRule implements RuleInterface
     public function taxByType($item): self
     {
 
-        if ($this->client->is_tax_exempt) {
+        if ($this->client->is_tax_exempt || !property_exists($item, 'tax_id')) {
             return $this->taxExempt($item);
         }