diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index c86502ba2f..199c12e814 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -78,11 +78,6 @@ const LocaleLayout = async ({
   return (
     <html lang={locale ?? 'en'} className={cn('h-full', instrumentSerif.variable)} suppressHydrationWarning>
       <head>
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `(function(){try{var t=localStorage.getItem('theme');var d=document.documentElement;if(t==='dark'||(t!=='light'&&matchMedia('(prefers-color-scheme:dark)').matches))d.setAttribute('data-theme','dark');else d.setAttribute('data-theme','light')}catch(e){}})()`,
-          }}
-        />
         <link rel="manifest" href="/manifest.json" />
         <meta name="theme-color" content="#1C64F2" />
         <meta name="mobile-web-app-capable" content="yes" />
@@ -102,17 +97,17 @@ const LocaleLayout = async ({
         <PWAProvider>
           <ReactScanLoader />
           <JotaiProvider>
-            <NuqsAdapter>
-              <BrowserInitializer>
-                <SentryInitializer>
-                  <TanstackQueryInitializer>
-                    <ThemeProvider
-                      attribute="data-theme"
-                      defaultTheme="system"
-                      enableSystem
-                      disableTransitionOnChange
-                      enableColorScheme={false}
-                    >
+            <ThemeProvider
+              attribute="data-theme"
+              defaultTheme="system"
+              enableSystem
+              disableTransitionOnChange
+              enableColorScheme={false}
+            >
+              <NuqsAdapter>
+                <BrowserInitializer>
+                  <SentryInitializer>
+                    <TanstackQueryInitializer>
                       <I18nServerProvider>
                         <ToastProvider>
                           <GlobalPublicStoreProvider>
@@ -120,11 +115,11 @@ const LocaleLayout = async ({
                           </GlobalPublicStoreProvider>
                         </ToastProvider>
                       </I18nServerProvider>
-                    </ThemeProvider>
-                  </TanstackQueryInitializer>
-                </SentryInitializer>
-              </BrowserInitializer>
-            </NuqsAdapter>
+                    </TanstackQueryInitializer>
+                  </SentryInitializer>
+                </BrowserInitializer>
+              </NuqsAdapter>
+            </ThemeProvider>
           </JotaiProvider>
           <RoutePrefixHandle />
         </PWAProvider>
