diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
index b0067bb909..7155be04c4 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -161,7 +161,11 @@ export const ProjectFeatureToggles = ({
             });
             refetch();
         },
-        [toggleFeatureEnvironmentOff, toggleFeatureEnvironmentOn] // eslint-disable-line react-hooks/exhaustive-deps
+        [
+            toggleFeatureEnvironmentOff,
+            toggleFeatureEnvironmentOn,
+            isChangeRequestConfigured,
+        ]
     );
 
     const columns = useMemo(
@@ -257,7 +261,7 @@ export const ProjectFeatureToggles = ({
                 disableSortBy: true,
             },
         ],
-        [projectId, environments, onToggle, loading]
+        [projectId, environments, loading]
     );
 
     const [searchValue, setSearchValue] = useState(