diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php
index 02391e134..1ef0dac0f 100644
--- a/classes/tax/TaxRulesGroup.php
+++ b/classes/tax/TaxRulesGroup.php
@@ -113,11 +113,11 @@ class TaxRulesGroupCore extends ObjectModel
 	    );
 	}
 	
-	public function hasUniqueTaxRuleForCountry($id_country, $id_state)
+	public function hasUniqueTaxRuleForCountry($id_country, $id_state, $id_tax_rule = false)
 	{
 		$rules = TaxRule::getTaxRulesByGroupId((int)Context::getContext()->language->id, (int)$this->id);
 		foreach ($rules as $rule)
-			if ($rule['id_country'] == $id_country && $id_state == $rule['id_state'] && !$rule['behavior'])
+			if ($rule['id_country'] == $id_country && $id_state == $rule['id_state'] && !$rule['behavior'] && (int)$id_tax_rule != $rule['id_tax_rule'])
 				return true;
 
 		return false;
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index ac37c2d72..63772700d 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -404,7 +404,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 		{
 			foreach ($this->selected_states as $id_state)
 			{
-				if ($tax_rules_group->hasUniqueTaxRuleForCountry($id_country, $id_state))
+				if ($tax_rules_group->hasUniqueTaxRuleForCountry($id_country, $id_state, $id_rule))
 				{
 					$this->errors[] = Tools::displayError('A tax rule already exists for this country/state with tax only behavior');
 					continue;