diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 6ff35c91e8..b99080f06b 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -280,6 +280,14 @@ frappe.Application = class Application {
 			if (frappe.boot.print_css) {
 				frappe.dom.set_style(frappe.boot.print_css, "print-style");
 			}
+
+			let current_app = localStorage.current_app;
+			if (current_app) {
+				frappe.boot.setup_complete =
+					frappe.boot.setup_wizard_not_required_apps?.includes(current_app) ||
+					frappe.boot.setup_wizard_completed_apps?.includes(current_app);
+			}
+
 			frappe.user.name = frappe.boot.user.name;
 			frappe.router.setup();
 		} else {
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 1354b25e56..2654f540d7 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -128,13 +128,8 @@ frappe.router = {
 		if (!frappe.app) return;
 
 		let sub_path = this.get_sub_path();
-		let current_app = localStorage.current_app;
 
-		if (
-			frappe.boot.setup_complete ||
-			(current_app && frappe.boot.setup_wizard_not_required_apps?.includes(current_app)) ||
-			(current_app && frappe.boot.setup_wizard_completed_apps?.includes(current_app))
-		) {
+		if (frappe.boot.setup_complete) {
 			!frappe.re_route["setup-wizard"] && (frappe.re_route["setup-wizard"] = "app");
 		} else if (!sub_path.startsWith("setup-wizard")) {
 			frappe.re_route["setup-wizard"] && delete frappe.re_route["setup-wizard"];