diff --git a/install/components/opensource/order/class.php b/install/components/opensource/order/class.php
index ebf26b4..7b07244 100644
--- a/install/components/opensource/order/class.php
+++ b/install/components/opensource/order/class.php
@@ -374,11 +374,6 @@ public function executeComponent()
         try {
             $this->createVirtualOrder($this->arParams['PERSON_TYPE_ID']);
 
-            $propertiesList = $this->request['properties'] ?? $this->arParams['DEFAULT_PROPERTIES'] ?? [];
-            if (!empty($propertiesList)) {
-                $this->setOrderProperties($propertiesList);
-            }
-
             $deliveryId = $this->request['delivery_id'] ?? $this->arParams['DEFAULT_DELIVERY_ID'] ?? 0;
             $this->createOrderShipment($deliveryId);
 
@@ -387,6 +382,11 @@ public function executeComponent()
                 $this->createOrderPayment($paySystemId);
             }
 
+            $propertiesList = $this->request['properties'] ?? $this->arParams['DEFAULT_PROPERTIES'] ?? [];
+            if (!empty($propertiesList)) {
+                $this->setOrderProperties($propertiesList);
+            }
+
             if ($this->arParams['SAVE']) {
                 $validationResult = $this->validateOrder();
 
@@ -406,4 +406,4 @@ public function executeComponent()
         $this->includeComponentTemplate();
     }
 
-}
\ No newline at end of file
+}