diff --git a/client/src/org/compiere/grid/ed/VPAttribute.java b/client/src/org/compiere/grid/ed/VPAttribute.java
index 519249365f..a13898f573 100644
--- a/client/src/org/compiere/grid/ed/VPAttribute.java
+++ b/client/src/org/compiere/grid/ed/VPAttribute.java
@@ -56,6 +56,7 @@ import org.compiere.util.Msg;
  * @author Teo Sarca, SC ARHIPAC SERVICE SRL
  * 			<li>BF [ 1895041 ] NPE when move product with attribute set
  * 			<li>BF [ 1770177 ] Inventory Move Locator Error - integrated MGrigioni bug fix
+ * 			<li>BF [ 2011222 ] ASI Dialog is reseting locator
  */
 public class VPAttribute extends JComponent
 	implements VEditor, ActionListener
@@ -371,7 +372,7 @@ public class VPAttribute extends JComponent
 			{
 				m_text.setText(vad.getM_AttributeSetInstanceName());
 				M_AttributeSetInstance_ID = vad.getM_AttributeSetInstance_ID();
-				if (m_GridTab != null && !productWindow)
+				if (m_GridTab != null && !productWindow && vad.getM_Locator_ID() > 0)
 					m_GridTab.setValue("M_Locator_ID", vad.getM_Locator_ID());
 				changed = true;
 			}