diff --git a/base/src/org/compiere/model/MRMA.java b/base/src/org/compiere/model/MRMA.java
index 00e7a0c393..1fa092ef6a 100644
--- a/base/src/org/compiere/model/MRMA.java
+++ b/base/src/org/compiere/model/MRMA.java
@@ -226,6 +226,8 @@ public class MRMA extends X_M_RMA implements DocAction
 	 */
 	protected boolean beforeSave (boolean newRecord)
 	{
+		if (newRecord)
+			setC_Order_ID(0);
 	    getShipment();
 		//	Set BPartner
 		if (getC_BPartner_ID() == 0)