diff --git a/package/base-files/default/etc/hotplug.d/block/01-mount b/package/base-files/default/etc/hotplug.d/block/01-mount
index b6275e5a28..db8ccdabd6 100755
--- a/package/base-files/default/etc/hotplug.d/block/01-mount
+++ b/package/base-files/default/etc/hotplug.d/block/01-mount
@@ -19,8 +19,8 @@ add)
 	}
 	;;
 remove)
-	umount /tmp/$DEV
-	rm -rf /dev/$DEV /tmp/$DEV
+	umount /tmp/$DEV && rmdir /tmp/$DEV
+	rm -f /dev/$DEV /tmp/$DEV
 	;;
 esac
 } 2>&1 | logger