diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/ChildrenTooltip.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/ChildrenTooltip.tsx
index a7795b5bdf..c145ffe9eb 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/ChildrenTooltip.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/ChildrenTooltip.tsx
@@ -10,7 +10,10 @@ export const ChildrenTooltip: FC<{
         tooltip={
             <>
                 {childFeatures.map((child) => (
-                    <StyledLink to={`/projects/${project}/features/${child}`}>
+                    <StyledLink
+                        key={`${project}-${child}`}
+                        to={`/projects/${project}/features/${child}`}
+                    >
                         <div>{child}</div>
                     </StyledLink>
                 ))}
diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/FeatureToggleSwitch.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/FeatureToggleSwitch.tsx
index edb7b1f24f..ebeb3c23c3 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/FeatureToggleSwitch.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/FeatureToggleSwitch.tsx
@@ -49,7 +49,7 @@ export const FeatureToggleSwitch: VFC<FeatureToggleSwitchProps> = ({
                             ? `Disable feature in ${environmentName}`
                             : `Enable feature in ${environmentName}`
                     }
-                    checked={isChecked}
+                    checked={value}
                     environmentId={environmentName}
                     projectId={projectId}
                     permission={UPDATE_FEATURE_ENVIRONMENT}
diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/useFeatureToggleSwitch.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/useFeatureToggleSwitch.tsx
index cfee1f9b44..9c0e919bc6 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/useFeatureToggleSwitch.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/FeatureToggleSwitch/useFeatureToggleSwitch.tsx
@@ -69,32 +69,30 @@ export const useFeatureToggleSwitch: UseFeatureToggleSwitchType = (
                     return next();
                 }
 
-                if (isProdGuardEnabled(config.environmentType || '')) {
-                    setProdGuardModalState({
-                        open: true,
-                        label: `${
-                            !newState ? 'Disable' : 'Enable'
-                        } Environment`,
-                        loading: false,
-                        onClose: () => {
-                            setProdGuardModalState((prev) => ({
-                                ...prev,
-                                open: false,
-                            }));
-                            config.onRollback?.();
-                        },
-                        onClick: () => {
-                            setProdGuardModalState((prev) => ({
-                                ...prev,
-                                open: false,
-                                loading: true,
-                            }));
-                            next();
-                        },
-                    });
+                if (!isProdGuardEnabled(config.environmentType || '')) {
+                    return next();
                 }
 
-                return next();
+                setProdGuardModalState({
+                    open: true,
+                    label: `${!newState ? 'Disable' : 'Enable'} Environment`,
+                    loading: false,
+                    onClose: () => {
+                        setProdGuardModalState((prev) => ({
+                            ...prev,
+                            open: false,
+                        }));
+                        config.onRollback?.();
+                    },
+                    onClick: () => {
+                        setProdGuardModalState((prev) => ({
+                            ...prev,
+                            open: false,
+                            loading: true,
+                        }));
+                        next();
+                    },
+                });
             };
 
             const ensureActiveStrategies: Middleware = (next) => {
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index d29036dbcb..02f332cc2c 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -90,6 +90,7 @@ exports[`should create default config 1`] = `
       "embedProxy": true,
       "embedProxyFrontend": true,
       "featureNamingPattern": false,
+      "featureSwitchRefactor": false,
       "featuresExportImport": true,
       "filterInvalidClientMetrics": false,
       "googleAuthEnabled": false,
@@ -135,6 +136,7 @@ exports[`should create default config 1`] = `
       "embedProxy": true,
       "embedProxyFrontend": true,
       "featureNamingPattern": false,
+      "featureSwitchRefactor": false,
       "featuresExportImport": true,
       "filterInvalidClientMetrics": false,
       "googleAuthEnabled": false,