diff --git a/openmetadata-ui/src/main/resources/ui/src/router/AppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/router/AppRouter.tsx
index 1bff034150e..a9d356317cd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/router/AppRouter.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/router/AppRouter.tsx
@@ -157,7 +157,6 @@ const AppRouter = () => {
             {callbackComponent ? (
               <Route component={callbackComponent} path={ROUTES.CALLBACK} />
             ) : null}
-            <Route exact component={PageNotFound} path={ROUTES.NOT_FOUND} />
             {isAuthDisabled || isAuthenticated ? (
               <AuthenticatedAppRouter />
             ) : (
@@ -180,6 +179,7 @@ const AppRouter = () => {
                 />
               </>
             )}
+            <Route exact component={PageNotFound} path={ROUTES.NOT_FOUND} />
           </Switch>
         </>
       )}