diff --git a/web/src/app/_layout/FeatureFlagConfig.tsx b/web/src/app/_layout/FeatureFlagConfig.tsx
index ad08d3db..efd33bb3 100644
--- a/web/src/app/_layout/FeatureFlagConfig.tsx
+++ b/web/src/app/_layout/FeatureFlagConfig.tsx
@@ -109,7 +109,7 @@ export const FeatureFlagConfig = () => {
               <Label>{label}</Label>
               <Switch
                 disabled={!override}
-                checked={featureFlags[key]}
+                checked={featureFlags[key] ?? data?.[key]}
                 onCheckedChange={(value) => setFeatureFlagOverride(key, value)}
               />
             </div>