diff --git a/src/app/console/Console.tsx b/src/app/console/Console.tsx
index c7661a6..3031354 100644
--- a/src/app/console/Console.tsx
+++ b/src/app/console/Console.tsx
@@ -53,7 +53,7 @@ export default function Console() {
     } catch (err) {
       setError(err instanceof Error ? err : Error(String(err)));
     }
-  }, []);
+  }, [clearError, setError]);
 
   const handleSubmit = (values: IConsole) => {
     const { flagKey, entityId, context } = values;
diff --git a/src/app/flags/Evaluation.tsx b/src/app/flags/Evaluation.tsx
index 0aa3b0c..096cc4f 100644
--- a/src/app/flags/Evaluation.tsx
+++ b/src/app/flags/Evaluation.tsx
@@ -102,7 +102,7 @@ export default function Evaluation() {
     });
 
     setRules(rules);
-  }, [rulesVersion]);
+  }, [flag]);
 
   const incrementRulesVersion = () => {
     setRulesVersion(rulesVersion + 1);
@@ -156,7 +156,7 @@ export default function Evaluation() {
 
   useEffect(() => {
     loadData();
-  }, [rulesVersion]);
+  }, [loadData, rulesVersion]);
 
   return (
     <>
diff --git a/src/app/flags/Flag.tsx b/src/app/flags/Flag.tsx
index 6d07549..77db371 100644
--- a/src/app/flags/Flag.tsx
+++ b/src/app/flags/Flag.tsx
@@ -42,7 +42,7 @@ export default function Flag() {
       .catch((err) => {
         setError(err);
       });
-  }, [flagVersion]);
+  }, [clearError, flag.key, setError]);
 
   const incrementFlagVersion = () => {
     setFlagVersion(flagVersion + 1);
diff --git a/src/app/flags/Flags.tsx b/src/app/flags/Flags.tsx
index bd899f8..18a9f97 100644
--- a/src/app/flags/Flags.tsx
+++ b/src/app/flags/Flags.tsx
@@ -20,7 +20,7 @@ export default function Flags() {
       return;
     }
     clearError();
-  }, error);
+  }, [clearError, error, setError]);
 
   return (
     <>
diff --git a/src/app/segments/Segment.tsx b/src/app/segments/Segment.tsx
index a34b4e8..f491052 100644
--- a/src/app/segments/Segment.tsx
+++ b/src/app/segments/Segment.tsx
@@ -37,7 +37,7 @@ export default function Segment() {
   const navigate = useNavigate();
 
   const [segment, setSegment] = useState<ISegment>(useLoaderData() as ISegment);
-  const [segmentVerison, setSegmentVersion] = useState(0);
+  const [segmentVersion, setSegmentVersion] = useState(0);
 
   const [showConstraintForm, setShowConstraintForm] = useState<boolean>(false);
   const [editingConstraint, setEditingConstraint] =
@@ -60,15 +60,15 @@ export default function Segment() {
       .catch((err) => {
         setError(err);
       });
-  }, [segmentVerison]);
+  }, [clearError, segment.key, setError]);
 
   const incrementSegmentVersion = () => {
-    setSegmentVersion(segmentVerison + 1);
+    setSegmentVersion(segmentVersion + 1);
   };
 
   useEffect(() => {
     fetchSegment();
-  }, [segmentVerison, fetchSegment]);
+  }, [segmentVersion, fetchSegment]);
 
   const constraintTypeToLabel = (t: string) =>
     ComparisonType[t as keyof typeof ComparisonType];
diff --git a/src/app/segments/Segments.tsx b/src/app/segments/Segments.tsx
index 368b150..e11be53 100644
--- a/src/app/segments/Segments.tsx
+++ b/src/app/segments/Segments.tsx
@@ -20,7 +20,7 @@ export default function Segments() {
       return;
     }
     clearError();
-  }, error);
+  }, [clearError, error, setError]);
 
   return (
     <>