diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 1ae1456..437ed2f 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1475,8 +1475,6 @@
 	char lun_file[255];
 	bool has_multiple_lun = false;
 
-	property_set("sys.storage.ums_enabled", "1");
-	sleep(1);
 	DataManager::GetValue(TW_HAS_DATA_MEDIA, has_data_media);
 	string Lun_File_str = CUSTOM_LUN_FILE;
 	size_t found = Lun_File_str.find("%");
@@ -1522,12 +1520,12 @@
 			goto error_handle;
 		}
 	}
+	property_set("sys.storage.ums_enabled", "1");
 	return true;
 error_handle:
 	if (mtp_was_enabled)
 		if (!Enable_MTP())
 			Disable_MTP();
-	property_set("sys.storage.ums_enabled", "0");
 	return false;
 }