diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsx
index 04fa9f6..bf586b1 100644
--- a/ui/src/components/Layout.tsx
+++ b/ui/src/components/Layout.tsx
@@ -41,7 +41,7 @@ export function Layout() {
 
   // Determine current org slug for server dashboard link
   const currentOrg = organizations.find((o) => o.id === currentOrgId);
-  const serverDashboardHref = currentOrg?.slug ? `/t/${currentOrg.slug}/` : '/server/';
+  const serverDashboardHref = currentOrg?.slug ? `/t/${currentOrg.slug}/` : '#';
 
   // Build breadcrumbs from path
   const segments = location.pathname.replace(/^\//, '').split('/').filter(Boolean);
diff --git a/ui/src/router.tsx b/ui/src/router.tsx
index 24260dc..3c9f930 100644
--- a/ui/src/router.tsx
+++ b/ui/src/router.tsx
@@ -39,9 +39,12 @@ function LandingRedirect() {
     return <Navigate to="/tenant" replace />;
   }
   // Regular user (operator/viewer) → server dashboard directly
-  const serverUrl = currentOrg?.slug ? `/t/${currentOrg.slug}/` : '/server/';
-  window.location.href = serverUrl;
-  return null;
+  if (currentOrg?.slug) {
+    window.location.href = `/t/${currentOrg.slug}/`;
+    return null;
+  }
+  // No org resolved yet — stay on tenant portal
+  return <Navigate to="/tenant" replace />;
 }
 
 export function AppRouter() {