diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php
index cbba96b085c..289a306478a 100644
--- a/app/code/core/Mage/Sales/Model/Order/Status/History.php
+++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php
@@ -75,7 +75,7 @@ protected function _construct()
     }
 
     /**
-     * Set order object and grab some metadata from it
+     * Set order object
      *
      * @param   Mage_Sales_Model_Order $order
      * @return  Mage_Sales_Model_Order_Status_History
@@ -83,7 +83,6 @@ protected function _construct()
     public function setOrder(Mage_Sales_Model_Order $order)
     {
         $this->_order = $order;
-        $this->setStoreId($order->getStoreId());
         return $this;
     }
 
@@ -147,6 +146,16 @@ public function getStore()
         return Mage::app()->getStore();
     }
 
+    /**
+     * Get store id
+     *
+     * @return integer
+     */
+    public function getStoreId()
+    {
+        return $this->getStore()->getStoreId();
+    }
+
     /**
      * Set order again if required
      *