diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLine.java b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
index 04841e5506..70e4b36ea7 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
@@ -798,9 +798,9 @@ public class MOrderLine extends X_C_OrderLine
 			setHeaderInfo(getParent());
 
 		
-		//	R/O Check - Product/Warehouse Change
+		//	R/O Check - Product/Warehouse Change/Attribute set instance
 		if (!newRecord 
-			&& (is_ValueChanged("M_Product_ID") || is_ValueChanged("M_Warehouse_ID"))) 
+			&& (is_ValueChanged("M_Product_ID") || is_ValueChanged("M_Warehouse_ID") || is_ValueChanged("M_AttributeSetInstance_ID"))) 
 		{
 			if (!canChangeWarehouse())
 				return false;