diff --git a/src/utils/dashboard.js b/src/utils/dashboard.js
index b7deb9f8d0..9ae4237e55 100644
--- a/src/utils/dashboard.js
+++ b/src/utils/dashboard.js
@@ -107,8 +107,12 @@ export function logout() {
         queryClient.clear();
         // Reset cached views
         viewContainer.reset();
-        appHost.supports(AppFeature.MultiServer) ?
-            navigate('selectserver') : navigate('login');
+
+        if (appHost.supports(AppFeature.MultiServer)) {
+            selectServer();
+        } else {
+            navigate('login');
+        }
     });
 }