diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
index 8fa649585a..d9c5927177 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
@@ -34,7 +34,7 @@ public class DefaultLookupFactory implements ILookupFactory{
 	@Override
 	public Lookup getLookup(GridFieldVO gridFieldVO) {
 		Lookup lookup = null;
-		if (gridFieldVO.lookupInfo == null) // IDEMPIERE-913
+		if (gridFieldVO.lookupInfo == null && DisplayType.isLookup(gridFieldVO.displayType)) // IDEMPIERE-913
 			gridFieldVO.loadLookupInfo();
 		if (gridFieldVO.displayType == Location)   //  not cached
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
index 4c080e593c..fe591e214e 100644
--- a/org.adempiere.base/src/org/compiere/model/GridField.java
+++ b/org.adempiere.base/src/org/compiere/model/GridField.java
@@ -234,7 +234,7 @@ public class GridField
 	 */
 	public Lookup getLookup()
 	{ 
-		if (m_lookup == null) loadLookupFromFactory(); // IDEMPIERE-913
+		if (m_lookup == null) loadLookupNoValidate(); // IDEMPIERE-913
 		return m_lookup;
 	}    //  getLookup