diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index 1a85860e11b0b..f0477fd76014a 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -150,8 +150,8 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
         $extensionAttributes = $entity->getExtensionAttributes();
         if ($entity->getIsNotVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
             $shippingAssignments = $extensionAttributes->getShippingAssignments();
-            if (count($shippingAssignments) === 1) {
-                $shipping = $shippingAssignments[0]->getShipping();
+            if (!empty($shippingAssignments)) {
+                $shipping = array_shift($shippingAssignments)->getShipping();
                 $entity->setShippingAddress($shipping->getAddress());
                 $entity->setShippingMethod($shipping->getMethod());
             }