diff --git a/base/src/org/compiere/util/Env.java b/base/src/org/compiere/util/Env.java
index 5650f94eb7..0c990f0e7d 100644
--- a/base/src/org/compiere/util/Env.java
+++ b/base/src/org/compiere/util/Env.java
@@ -384,7 +384,8 @@ public final class Env
 		//
 		if (value == null)
 			if (context.endsWith("_ID"))
-				value = new String("-1");
+				// TODO: Research potential problems with tables with Record_ID=0
+				value = new String("0");
 			else
 				value = new String("");
 		ctx.setProperty(WindowNo+"|"+TabNo+"|"+context, value);