diff --git a/src/dotnet/QuantEngine.Web/Components/App.razor b/src/dotnet/QuantEngine.Web/Components/App.razor
index ab1d35d..77f65b7 100644
--- a/src/dotnet/QuantEngine.Web/Components/App.razor
+++ b/src/dotnet/QuantEngine.Web/Components/App.razor
@@ -24,7 +24,19 @@
         <CascadingAuthenticationState>
             <Router AppAssembly="@typeof(App).Assembly"
                     AdditionalAssemblies="new[] { typeof(QuantEngine.Web.Client.Pages.Dashboard).Assembly }"
-                    OnNavigateAsync="@OnNavigateAsync" />
+                    OnNavigateAsync="@OnNavigateAsync">
+                <Found Context="routeData">
+                    <RouteView RouteData="@routeData" DefaultLayout="@typeof(QuantEngine.Web.Client.Layout.MainLayout)" />
+                    <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+                </Found>
+                <NotFound>
+                    <PageTitle>페이지를 찾을 수 없음</PageTitle>
+                    <div class="alert alert-danger">
+                        <h3>404 - 페이지를 찾을 수 없습니다</h3>
+                        <p>요청하신 페이지가 존재하지 않습니다.</p>
+                    </div>
+                </NotFound>
+            </Router>
         </CascadingAuthenticationState>
     </div>