diff --git a/frappe/sessions.py b/frappe/sessions.py
index 6e0ce73732..67b58e1d89 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -187,7 +187,7 @@ def get():
 	bootinfo["translated_search_doctypes"] = frappe.get_hooks("translated_search_doctypes")
 	bootinfo["disable_async"] = frappe.conf.disable_async
 
-	bootinfo["setup_complete"] = cint(frappe.db.get_single_value("System Settings", "setup_complete"))
+	bootinfo["setup_complete"] = cint(frappe.get_system_settings("setup_complete"))
 
 	bootinfo["desk_theme"] = frappe.db.get_value("User", frappe.session.user, "desk_theme") or "Light"
 
diff --git a/frappe/www/app.py b/frappe/www/app.py
index f1b62a0899..9a8c80d6b1 100644
--- a/frappe/www/app.py
+++ b/frappe/www/app.py
@@ -32,8 +32,6 @@ def get_context(context):
 
 	frappe.db.commit()
 
-	desk_theme = frappe.db.get_value("User", frappe.session.user, "desk_theme")
-
 	boot_json = frappe.as_json(boot)
 
 	# remove script tags from boot
@@ -52,7 +50,7 @@ def get_context(context):
 			"lang": frappe.local.lang,
 			"sounds": hooks["sounds"],
 			"boot": boot if context.get("for_mobile") else boot_json,
-			"desk_theme": desk_theme or "Light",
+			"desk_theme": boot.get("desk_theme") or "Light",
 			"csrf_token": csrf_token,
 			"google_analytics_id": frappe.conf.get("google_analytics_id"),
 			"google_analytics_anonymize_ip": frappe.conf.get("google_analytics_anonymize_ip"),