diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 003dcd1..be6674b 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2015,6 +2015,8 @@
 	}
 
 	if (Part) {
+		if (Part->MTP_Storage_ID == 0)
+			return false;
 		if (message_type == MTP_MESSAGE_REMOVE_STORAGE) {
 			mtp_message.message_type = MTP_MESSAGE_REMOVE_STORAGE; // Remove
 			LOGINFO("sending message to remove %i\n", Part->MTP_Storage_ID);