diff --git a/js/global_scope_js.js b/js/global_scope_js.js
index 4d8c1121..2b3f38e7 100644
--- a/js/global_scope_js.js
+++ b/js/global_scope_js.js
@@ -352,27 +352,6 @@ function handleMorphdomUpdate(data) {
   });
 }
 
-// Wait for Gradio to finish setting its styles, then force dark theme
-const observer = new MutationObserver((mutations) => {
-  mutations.forEach((mutation) => {
-    if (mutation.type === "attributes" &&
-        mutation.target.tagName === "GRADIO-APP" &&
-        mutation.attributeName === "style") {
-
-      // Gradio just set its styles, now force dark theme
-      document.body.classList.add("dark");
-      observer.disconnect();
-    }
-  });
-});
-
-// Start observing
-observer.observe(document.documentElement, {
-  attributes: true,
-  subtree: true,
-  attributeFilter: ["style"]
-});
-
 //------------------------------------------------
 // Suppress "Attempted to select a non-interactive or hidden tab" warning
 //------------------------------------------------
diff --git a/server.py b/server.py
index 431565d1..60dc8bbc 100644
--- a/server.py
+++ b/server.py
@@ -157,7 +157,7 @@ def create_interface():
         f'<script>{ui.global_scope_js}</script>',
     ])
 
-    with gr.Blocks(css=css, analytics_enabled=False, title=title, theme=ui.theme, head=head_html) as shared.gradio['interface']:
+    with gr.Blocks(css=css, analytics_enabled=False, title=title, theme=ui.theme, head=head_html, dark_theme=shared.settings['dark_theme']) as shared.gradio['interface']:
 
         # Interface state
         shared.gradio['interface_state'] = gr.State({k: None for k in shared.input_elements})
@@ -209,26 +209,8 @@ def create_interface():
             gradio('show_controls'),
             None,
             js=f"""(x) => {{
-                // Check if this is first visit or if localStorage is out of sync
-                const savedTheme = localStorage.getItem('theme');
-                const serverTheme = {str(shared.settings['dark_theme']).lower()} ? 'dark' : 'light';
-
-                // If no saved theme or mismatch with server on first load, use server setting
-                if (!savedTheme || !sessionStorage.getItem('theme_synced')) {{
-                    localStorage.setItem('theme', serverTheme);
-                    sessionStorage.setItem('theme_synced', 'true');
-                    if (serverTheme === 'dark') {{
-                        document.getElementsByTagName('body')[0].classList.add('dark');
-                    }} else {{
-                        document.getElementsByTagName('body')[0].classList.remove('dark');
-                    }}
-                }} else {{
-                    // Use localStorage for subsequent reloads
-                    if (savedTheme === 'dark') {{
-                        document.getElementsByTagName('body')[0].classList.add('dark');
-                    }} else {{
-                        document.getElementsByTagName('body')[0].classList.remove('dark');
-                    }}
+                if (!localStorage.getItem('theme')) {{
+                    localStorage.setItem('theme', {str(shared.settings['dark_theme']).lower()} ? 'dark' : 'light');
                 }}
                 {js}
                 {ui.show_controls_js}