diff --git a/packages/tui/src/context/theme.tsx b/packages/tui/src/context/theme.tsx
index 23cd3055f515..a8c9984f08c0 100644
--- a/packages/tui/src/context/theme.tsx
+++ b/packages/tui/src/context/theme.tsx
@@ -184,7 +184,11 @@ const themeContext = createSimpleContext({
     }
 
     onMount(() => {
-      void Promise.allSettled([resolveSystemTheme(store.mode), syncCustomThemes()]).finally(() => {
+      const systemTheme = resolveSystemTheme(store.mode)
+      void Promise.allSettled([
+        store.active === "system" ? systemTheme : Promise.resolve(),
+        syncCustomThemes(),
+      ]).finally(() => {
         valuesV2()
         setStore("ready", true)
       })