diff --git a/frappe/apps.py b/frappe/apps.py
index 6a96010a09..a59c72e8e1 100644
--- a/frappe/apps.py
+++ b/frappe/apps.py
@@ -68,5 +68,7 @@ def get_default_path():
 
 @frappe.whitelist()
 def set_app_as_default(app_name):
-	frappe.db.set_value("User", frappe.session.user, "default_app", app_name)
-	return True
+	if frappe.db.get_value("User", frappe.session.user, "default_app") == app_name:
+		frappe.db.set_value("User", frappe.session.user, "default_app", "")
+	else:
+		frappe.db.set_value("User", frappe.session.user, "default_app", app_name)