diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/ApiKeysPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/ApiKeysPage.razor
index 545139c..9a058a3 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/ApiKeysPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/ApiKeysPage.razor
@@ -1,4 +1,5 @@
 @page "/apikeys"
+@page "/dashboard/apikeys"
 @inherits DashboardPageBase
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject IDashboardApiKeyManagementService ApiKeyManagementService
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/DashboardHome.razor b/src/MxGateway.Server/Dashboard/Components/Pages/DashboardHome.razor
index 919594d..0197588 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/DashboardHome.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/DashboardHome.razor
@@ -1,4 +1,5 @@
 @page "/"
+@page "/dashboard/"
 @inherits DashboardPageBase
 
 <PageTitle>MXAccess Gateway Dashboard</PageTitle>
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/EventsPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/EventsPage.razor
index 0e0b687..e5401ec 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/EventsPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/EventsPage.razor
@@ -1,4 +1,5 @@
 @page "/events"
+@page "/dashboard/events"
 @inherits DashboardPageBase
 
 <PageTitle>Dashboard Events</PageTitle>
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/GalaxyPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/GalaxyPage.razor
index 48e97e2..3c5e4a2 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/GalaxyPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/GalaxyPage.razor
@@ -1,4 +1,5 @@
 @page "/galaxy"
+@page "/dashboard/galaxy"
 @inherits DashboardPageBase
 
 <PageTitle>Dashboard Galaxy</PageTitle>
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/SessionDetailsPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/SessionDetailsPage.razor
index 0eddbbc..569ad72 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/SessionDetailsPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/SessionDetailsPage.razor
@@ -1,4 +1,5 @@
 @page "/sessions/{SessionId}"
+@page "/dashboard/sessions/{SessionId}"
 @inherits DashboardPageBase
 
 <PageTitle>Dashboard Session</PageTitle>
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/SessionsPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/SessionsPage.razor
index e8df4dc..5c60e20 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/SessionsPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/SessionsPage.razor
@@ -1,4 +1,5 @@
 @page "/sessions"
+@page "/dashboard/sessions"
 @inherits DashboardPageBase
 
 <PageTitle>Dashboard Sessions</PageTitle>
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/SettingsPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/SettingsPage.razor
index 120aac0..ebf9930 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/SettingsPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/SettingsPage.razor
@@ -1,4 +1,5 @@
 @page "/settings"
+@page "/dashboard/settings"
 @inherits DashboardPageBase
 
 <PageTitle>Dashboard Settings</PageTitle>
diff --git a/src/MxGateway.Server/Dashboard/Components/Pages/WorkersPage.razor b/src/MxGateway.Server/Dashboard/Components/Pages/WorkersPage.razor
index 4811852..80f8182 100644
--- a/src/MxGateway.Server/Dashboard/Components/Pages/WorkersPage.razor
+++ b/src/MxGateway.Server/Dashboard/Components/Pages/WorkersPage.razor
@@ -1,4 +1,5 @@
 @page "/workers"
+@page "/dashboard/workers"
 @inherits DashboardPageBase
 
 <PageTitle>Dashboard Workers</PageTitle>
diff --git a/src/MxGateway.Tests/Gateway/GatewayApplicationTests.cs b/src/MxGateway.Tests/Gateway/GatewayApplicationTests.cs
index f1b6dfe..eb3ac52 100644
--- a/src/MxGateway.Tests/Gateway/GatewayApplicationTests.cs
+++ b/src/MxGateway.Tests/Gateway/GatewayApplicationTests.cs
@@ -100,13 +100,18 @@ public sealed class GatewayApplicationTests
     }
 
     /// <summary>
-    ///     Server-020 regression: every dashboard Razor page used to declare both
-    ///     <c>@page "/X"</c> and <c>@page "/dashboard/X"</c>, which — once
-    ///     <c>MapGroup("/dashboard")</c> prepended the path base — produced both
-    ///     <c>/dashboard/X</c> AND <c>/dashboard/dashboard/X</c> routes. The second
-    ///     shape was almost certainly accidental and is no longer registered. The
-    ///     check covers every dashboard page so a future page that brings back the
-    ///     duplicated <c>@page</c> directive fails CI.
+    ///     Server-020 regression guard. The original Server-020 finding incorrectly
+    ///     concluded that the duplicate <c>@page "/dashboard/X"</c> directives were
+    ///     redundant because <c>MapGroup("/dashboard")</c> would prepend the prefix
+    ///     to all dashboard Razor pages. In practice Blazor SSR's <c>@page</c>
+    ///     template matcher does NOT compose with <c>MapGroup</c>, so removing the
+    ///     <c>/dashboard/X</c> directive left the dashboard unreachable at runtime
+    ///     (every page returned HTTP 500 with "Unable to find the provided template
+    ///     '/dashboard/'" from <c>RouteTableFactory.CreateEntry</c>). The duplicate
+    ///     <c>@page</c> directives are restored. This test only confirms the
+    ///     genuinely-double-prefixed shape (<c>/dashboard/dashboard/X</c>) never
+    ///     appears — it never did, since the original duplicates were
+    ///     <c>"/"</c> + <c>"/dashboard/"</c>, not <c>"/dashboard/"</c> repeated.
     /// </summary>
     [Fact]
     public async Task Build_WhenDashboardEnabled_DoesNotRegisterDoubledDashboardPrefixRoutes()