From a951ac61d0900764a4ec85df8e1250c0dcd24af4 Mon Sep 17 00:00:00 2001
From: Josh Gordon <jogordon@skylinenet.net>
Date: Mon, 6 Jul 2026 14:13:13 -0500
Subject: [PATCH] UI: Don't set management server ID if cookie isn't set
 (#13404)

---
 ui/src/permission.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/src/permission.js b/ui/src/permission.js
index eeb36c57117..58f24b4dbc2 100644
--- a/ui/src/permission.js
+++ b/ui/src/permission.js
@@ -93,7 +93,10 @@ router.beforeEach((to, from, next) => {
           return
         }
         store.commit('SET_LOGIN_FLAG', true)
-        store.commit('SET_MS_ID', Cookies.get('managementserverid'))
+        const MS_ID = Cookies.get('managementserverid')
+        if (MS_ID) {
+          store.commit('SET_MS_ID', MS_ID)
+        }
       }
       if (Object.keys(store.getters.apis).length === 0) {
         const cachedApis = vueProps.$localStorage.get(APIS, {})