diff --git a/ui/src/app/layout.tsx b/ui/src/app/layout.tsx
index c63003a..060fdd3 100644
--- a/ui/src/app/layout.tsx
+++ b/ui/src/app/layout.tsx
@@ -35,7 +35,6 @@ export default function RootLayout({
 }: {
   children: React.ReactNode
 }) {
-  const isMaintenanceMode = process.env.MAINTENANCE_MODE === 'true';
 
   return (
     <html lang="en" suppressHydrationWarning>
@@ -60,26 +59,22 @@ export default function RootLayout({
       </head>
       <body
         className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
-        {isMaintenanceMode ? (
-          children
-        ) : (
-          <AuthProvider>
-            <AppConfigProvider>
-              <Suspense fallback={<SpinLoader />}>
-                <UserConfigProvider>
-                  <OnboardingProvider>
-                    <PostHogIdentify />
-                    <AppLayout>
-                      {children}
-                    </AppLayout>
-                    <Toaster />
-                    <ChatwootWidget />
-                  </OnboardingProvider>
-                </UserConfigProvider>
-              </Suspense>
-            </AppConfigProvider>
-          </AuthProvider>
-        )}
+        <AuthProvider>
+          <AppConfigProvider>
+            <Suspense fallback={<SpinLoader />}>
+              <UserConfigProvider>
+                <OnboardingProvider>
+                  <PostHogIdentify />
+                  <AppLayout>
+                    {children}
+                  </AppLayout>
+                  <Toaster />
+                  <ChatwootWidget />
+                </OnboardingProvider>
+              </UserConfigProvider>
+            </Suspense>
+          </AppConfigProvider>
+        </AuthProvider>
       </body>
     </html>
   );
diff --git a/ui/src/components/layout/AppLayout.tsx b/ui/src/components/layout/AppLayout.tsx
index 98b571e..6b1d513 100644
--- a/ui/src/components/layout/AppLayout.tsx
+++ b/ui/src/components/layout/AppLayout.tsx
@@ -21,8 +21,8 @@ const AppLayout: React.FC<AppLayoutProps> = ({
   const pathname = usePathname();
 
   // Check if current route should have sidebar
-  // Hide sidebar for root (/) and /handler routes (Stack Auth routes)
-  const shouldShowSidebar = pathname !== "/" && !pathname.startsWith("/handler");
+  // Hide sidebar for root (/), /handler routes (Stack Auth routes), and /maintenance
+  const shouldShowSidebar = pathname !== "/" && !pathname.startsWith("/handler") && pathname !== "/maintenance";
 
   // Check if we're in workflow editor mode or superadmin runs - collapse sidebar by default
   const isWorkflowEditor = /^\/workflow\/\d+/.test(pathname);
