diff --git a/src/App.tsx b/src/App.tsx
index 99e473f6..98dda23c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -320,16 +320,16 @@ export const App: React.FC = () => (
         <ScrollToTop />
         <AwaitableComponent.Root />
 
+        <ReactRouterSetter />
+
+        <CssBaseline enableColorScheme />
+
         <AuthGuard>
             <ServerUpdateChecker />
             <WebUIUpdateChecker />
             <InitialBackgroundRequests />
             <BackgroundSubscriptions />
 
-            <ReactRouterSetter />
-
-            <CssBaseline enableColorScheme />
-
             <Box sx={{ display: 'flex' }}>
                 <Box sx={{ flexShrink: 0, position: 'relative', height: '100vh' }}>
                     <DefaultNavBar />