diff --git a/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js b/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js
index 939aea52612434f5450d2f2a56cafdb07de0f079..03a7b02e08cb1b622f5b3bb716870c93b8246d64 100644
--- a/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js
+++ b/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js
@@ -8,7 +8,10 @@ var newAddressId = vars.get("$local.value");
 if (newAddressId)
 {
     neon.setFieldValue("$field.PAYMENTADDRESS", AddressUtils.getAddressById(newAddressId));
-    neon.setFieldValue("$field.ChosenDeliveryAddress", newAddressId);
-    neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
+    if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    {
+        neon.setFieldValue("$field.ChosenDeliveryAddress", newAddressId);
+        neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
+    }
     
 }
\ No newline at end of file