diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index f254439..ad17fe4 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1613,6 +1613,7 @@
 		}
 	}
 	property_set("sys.storage.ums_enabled", "1");
+	property_set("sys.usb.config", "mass_storage,adb");
 	return true;
 error_handle:
 	if (mtp_was_enabled)
@@ -1637,6 +1638,7 @@
 	Update_System_Details();
 	UnMount_Main_Partitions();
 	property_set("sys.storage.ums_enabled", "0");
+	property_set("sys.usb.config", "adb");
 	if (mtp_was_enabled)
 		if (!Enable_MTP())
 			Disable_MTP();