diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
index a675709e504b26f0b6fe4d9a4347fc74fbef8809..6a723f5c22c5af114b5ebffcd467e37fccf79a10 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -276,6 +276,7 @@ class StockItemRepository implements StockItemRepositoryInterface
             && $isInStock
             && !$stockItem->getIsInStock()
             && $stockItem->getOrigData(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY) == 0
+            && $stockItem->getOrigData(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY) !== null
         ) {
             $stockItem->setIsInStock(true)->setStockStatusChangedAutomaticallyFlag(true);
         }