Merge remote-tracking branch 'origin/AC-1342' into Arrows_2.4.7_Backlog_Delivery

Author: rimple-saini

app/code/Magento/Sales/Model/Order.php

@@ -198,6 +198,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
      * @deprecated 100.1.0 Remove unused dependency.
+     * @see no alternative
      */
     protected $productRepository;
 
@@ -1741,7 +1742,17 @@ public function getStatusHistoryById($statusId)
     public function addStatusHistory(\Magento\Sales\Model\Order\Status\History $history)
     {
         $history->setOrder($this);
-        $this->setStatus($history->getStatus());
+        if (!$history->getStatus()) {
+            $previousStatus = $this->getStatusHistoryCollection()->getFirstItem()->getData('status');
+            if (!$previousStatus) {
+                $defaultStatus = $this->getConfig()->getStateDefaultStatus($this->getState());
+                $history->setStatus($defaultStatus);
+            } else {
+                $history->setStatus($previousStatus);
+            }
+        } else {
+            $this->setStatus($history->getStatus());
+        }
         if (!$history->getId()) {
             $this->setStatusHistories(array_merge($this->getStatusHistories(), [$history]));
             $this->setDataChanges(true);