diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
index 7ad5f479dc22..fd63ffd09a6d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
@@ -722,7 +722,7 @@ public function addressAction()
     {
         $addressId = $this->getRequest()->getParam('address_id');
         $address = Mage::getModel('Mage_Sales_Model_Order_Address')->load($addressId);
-        if ($address) {
+        if ($address->getId()) {
             Mage::register('order_address', $address);
             $this->loadLayout();
             // Do not display VAT validation button on edit order address form