diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9ea3a13..aaa9be0 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -13,8 +13,11 @@ const themeStore = useThemeStore()
 const { connect } = useSSE()
 
 onMounted(async () => {
+  // Apply theme from cookie immediately to prevent flash-of-wrong-theme
   themeStore.init()
+  // Then load server config and re-apply with admin defaults
   await configStore.loadConfig()
+  themeStore.init()
   await themeStore.loadCustomThemes()
   await downloadsStore.fetchJobs()
   connect()