diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
index 0d177d0c003e6..b84c13acc3850 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -132,8 +132,8 @@ protected function prepareItems(
                     $qty = 1;
                 }
             } else {
-                if (isset($items[$orderItem->getId()])) {
-                    $qty = min($items[$orderItem->getId()], $orderItem->getQtyToShip());
+                if (isset($items[$orderItem->getProductId()])) {
+                    $qty = min($items[$orderItem->getProductId()], $orderItem->getQtyToShip());
                 } elseif (!count($items)) {
                     $qty = $orderItem->getQtyToShip();
                 } else {