diff --git a/frontend-admin/src/context/ThemeContext.tsx b/frontend-admin/src/context/ThemeContext.tsx
index fc3b40b2..aceae804 100644
--- a/frontend-admin/src/context/ThemeContext.tsx
+++ b/frontend-admin/src/context/ThemeContext.tsx
@@ -27,12 +27,13 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
             const result = await getSettings();
             if (result.success && result.settings) {
                 const s = result.settings;
-                const overrides: Partial<Colors> = {};
-                if (s.admin_color_primary) overrides.accent = s.admin_color_primary;
-                if (s.admin_color_secondary) overrides.secondary = s.admin_color_secondary;
-                if (s.admin_color_success) overrides.success = s.admin_color_success;
-                if (s.admin_color_danger) overrides.danger = s.admin_color_danger;
-                if (s.admin_color_warning) overrides.warning = s.admin_color_warning;
+                const overrides: Partial<Colors> = {
+                    ...(s.admin_color_primary   && { accent:    s.admin_color_primary }),
+                    ...(s.admin_color_secondary && { secondary: s.admin_color_secondary }),
+                    ...(s.admin_color_success   && { success:   s.admin_color_success }),
+                    ...(s.admin_color_danger    && { danger:    s.admin_color_danger }),
+                    ...(s.admin_color_warning   && { warning:   s.admin_color_warning }),
+                };
                 setColorOverrides(overrides);
                 AsyncStorage.setItem(COLORS_CACHE_KEY, JSON.stringify(overrides)).catch(() => {});
             }