diff --git a/Utils.cpp b/Utils.cpp
index 841aab6..d483418 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1076,6 +1076,7 @@
     if (status != android::OK) {
         LOG(ERROR) << "Failed to unmount " << pass_through_path;
     }
+    rmdir(pass_through_path.c_str());
 
     LOG(INFO) << "Unmounting fuse path " << fuse_path;
     android::status_t result = ForceUnmount(fuse_path);
@@ -1089,8 +1090,10 @@
             PLOG(ERROR) << "Failed to unmount with MNT_DETACH " << fuse_path;
             return -errno;
         }
-        return android::OK;
+        result = android::OK;
     }
+    rmdir(fuse_path.c_str());
+
     return result;
 }