diff --git a/VolumeBase.cpp b/VolumeBase.cpp
index de5b072..3b49b0d 100644
--- a/VolumeBase.cpp
+++ b/VolumeBase.cpp
@@ -135,6 +135,7 @@
     mCreated = true;
     status_t res = doCreate();
     notifyEvent(ResponseCode::VolumeCreated, StringPrintf("%d", mType));
+    setState(State::kUnmounted);
     return res;
 }
 
@@ -149,6 +150,7 @@
         unmount();
     }
 
+    setState(State::kRemoved);
     notifyEvent(ResponseCode::VolumeDestroyed);
     status_t res = doDestroy();
     mCreated = false;
@@ -185,8 +187,8 @@
     setState(State::kUnmounting);
 
     for (auto vol : mVolumes) {
-        if (vol->unmount()) {
-            LOG(WARNING) << getId() << " failed to unmount " << vol->getId()
+        if (vol->destroy()) {
+            LOG(WARNING) << getId() << " failed to destroy " << vol->getId()
                     << " stacked above";
         }
     }