diff --git a/partition.cpp b/partition.cpp
index 5cf0179..8832909 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -1318,7 +1318,7 @@
 		if (never_unmount_system == 1 && Mount_Point == "/system")
 			return true; // Never unmount system if you're not supposed to unmount it
 
-		if (Is_Storage)
+		if (Is_Storage && MTP_Storage_ID > 0)
 			PartitionManager.Remove_MTP_Storage(MTP_Storage_ID);
 
 		if (!Symlink_Mount_Point.empty())