diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index da11e8d..38584a9 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1520,6 +1520,7 @@
 		LOGERR("Unable to write to ums lunfile '%s': (%s)\n", Lun_File.c_str(), strerror(errno));
 		return false;
 	}
+	property_set("sys.storage.ums_enabled", "1");
 	return true;
 }
 
@@ -1580,6 +1581,7 @@
 	Mount_All_Storage();
 	Update_System_Details();
 	UnMount_Main_Partitions();
+	property_set("sys.storage.ums_enabled", "0");
 	if (ret < 0 && index == 0) {
 		LOGERR("Unable to write to ums lunfile '%s'.", lun_file);
 		return false;