diff --git a/frappe/boot.py b/frappe/boot.py
index f15b62614e..8cf75e02bb 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -250,13 +250,12 @@ def add_home_page(bootinfo, docs):
 
 	try:
 		page = frappe.desk.desk_page.get(home_page)
+		docs.append(page)
+		bootinfo['home_page'] = page.name
 	except (frappe.DoesNotExistError, frappe.PermissionError):
 		if frappe.message_log:
 			frappe.message_log.pop()
-		page = frappe.desk.desk_page.get('space')
-
-	bootinfo['home_page'] = page.name
-	docs.append(page)
+		bootinfo['home_page'] = 'Workspaces'
 
 def add_timezone_info(bootinfo):
 	system = bootinfo.sysdefaults.get("time_zone")
diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py
index 957cbbf72d..aac8b3deed 100644
--- a/frappe/core/doctype/server_script/test_server_script.py
+++ b/frappe/core/doctype/server_script/test_server_script.py
@@ -81,6 +81,7 @@ class TestServerScript(unittest.TestCase):
 	def tearDownClass(cls):
 		frappe.db.commit()
 		frappe.db.sql('truncate `tabServer Script`')
+		frappe.cache().delete_value('server_script_map')
 
 	def setUp(self):
 		frappe.cache().delete_value('server_script_map')
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index bd53396ceb..8c19c57876 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -333,7 +333,7 @@ frappe.router = {
 	},
 
 	make_url(params) {
-		return '/app/' + $.map(params, function(a) {
+		let path_string = $.map(params, function(a) {
 			if ($.isPlainObject(a)) {
 				frappe.route_options = a;
 				return null;
@@ -346,6 +346,8 @@ frappe.router = {
 				return a;
 			}
 		}).join('/');
+
+		return '/app/' + (path_string || 'home');
 	},
 
 	push_state(url) {