diff --git a/apps/console/src/App.tsx b/apps/console/src/App.tsx
index e1b8bf231..9e735d9a8 100644
--- a/apps/console/src/App.tsx
+++ b/apps/console/src/App.tsx
@@ -27,7 +27,6 @@ posthog.init(process.env.POSTHOG_KEY!, {
 const OrganizationSelectionPage = lazy(
   () => import("./pages/OrganizationSelectionPage")
 );
-const NotFoundPage = lazy(() => import("./pages/NotFoundPage"));
 
 function App() {
   return (
@@ -62,15 +61,6 @@ function App() {
                       </AuthLayout>
                     }
                   />
-
-                  <Route
-                    path="*"
-                    element={
-                      <Suspense>
-                        <NotFoundPage />
-                      </Suspense>
-                    }
-                  />
                 </Route>
               </Routes>
             </BrowserRouter>
diff --git a/apps/console/src/pages/authentication/Routes.tsx b/apps/console/src/pages/authentication/Routes.tsx
index e9cbb7a14..bf1ab635e 100644
--- a/apps/console/src/pages/authentication/Routes.tsx
+++ b/apps/console/src/pages/authentication/Routes.tsx
@@ -7,6 +7,7 @@ import LoginPage from "./LoginPage";
 import RegisterPage from "./RegisterPage";
 import ResetPasswordPage from "./ResetPasswordPage";
 import { VisitorErrorBoundaryWithLocation } from "./ErrorBoundary";
+import NotFoundPage from "../NotFoundPage";
 
 export function AuthenticationRoutes() {
   return (
@@ -71,6 +72,7 @@ export function AuthenticationRoutes() {
           </Suspense>
         }
       />
+      <Route path="*" element={<NotFoundPage />} />
     </Routes>
   );
 }
diff --git a/apps/console/src/pages/organizations/Routes.tsx b/apps/console/src/pages/organizations/Routes.tsx
index 2e910a32b..2dae27cfa 100644
--- a/apps/console/src/pages/organizations/Routes.tsx
+++ b/apps/console/src/pages/organizations/Routes.tsx
@@ -20,6 +20,7 @@ import { UpdatePolicyPage } from "./policies/UpdatePolicyPage";
 import { SettingsPage } from "./SettingsPage";
 import { CreateOrganizationPage } from "./CreateOrganizationPage";
 import HomePage from "./HomePage";
+import NotFoundPage from "../NotFoundPage";
 
 export function OrganizationsRoutes() {
   return (
@@ -58,6 +59,7 @@ export function OrganizationsRoutes() {
           element={<UpdatePolicyPage />}
         />
         <Route path="settings" element={<SettingsPage />} />
+        <Route path="*" element={<NotFoundPage />} />
       </Route>
 
       <Route path="*" element={<NoOrganizationLayout />}>