diff --git a/org.adempiere.base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java
index 2feaae8d20..c37041f5c6 100644
--- a/org.adempiere.base/src/org/compiere/model/MTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MTax.java
@@ -243,6 +243,7 @@ public class MTax extends X_C_Tax implements ImmutablePOSupport
 		List<MTax> list = new Query(getCtx(), I_C_Tax.Table_Name, whereClause,  get_TrxName())
 			.setParameters(getC_Tax_ID())
 			.setOnlyActiveRecords(true)
+			.setClient_ID()
 			.list();	
 		//red1 - end -
 		if (list.size() > 0 && is_Immutable())
diff --git a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
index 31aed1bd80..f398f60c2e 100644
--- a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
@@ -97,8 +97,6 @@ public class StandardTaxProvider implements ITaxProvider {
 				}
 				if (!oTax.delete(true, order.get_TrxName()))
 					return false;
-				if (!oTax.save(order.get_TrxName()))
-					return false;
 			}
 			else
 			{