diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 0ee838179d5..36d4e2d7600 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -2266,8 +2266,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
                         primaryStorageId);
             }
 
-            // set state to cancelmaintenance
-            primaryStorage.setStatus(StoragePoolStatus.CancelMaintenance);
+            // Change the storage state back to up
+            primaryStorage.setStatus(StoragePoolStatus.Up);
             _storagePoolDao.update(primaryStorageId, primaryStorage);
             txn.commit();
 
@@ -2373,10 +2373,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
                 throw new ExecutionException(msg);
             }
 
-            // Change the storage state back to up
-            primaryStorage.setStatus(StoragePoolStatus.Up);
-            _storagePoolDao.update(primaryStorageId, primaryStorage);
-
             return primaryStorage;
         } catch (Exception e) {
             setPoolStateToError(primaryStorage);