diff --git a/base/src/org/compiere/model/MImage.java b/base/src/org/compiere/model/MImage.java
index c44eab4e4f..05dcd8cab6 100644
--- a/base/src/org/compiere/model/MImage.java
+++ b/base/src/org/compiere/model/MImage.java
@@ -50,7 +50,7 @@ public class MImage extends X_AD_Image
 		if (retValue != null)
 			return retValue;
 		retValue = new MImage (ctx, AD_Image_ID, null);
-		if (retValue.get_ID () != 0)
+		if (retValue.get_ID () != 0 && Ini.isClient())
 			s_cache.put (key, retValue);
 		return retValue;
 	} //	get