diff --git a/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/Evaluators/index.tsx b/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/Evaluators/index.tsx
index 99600dda62..b3035dbfbf 100644
--- a/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/Evaluators/index.tsx
+++ b/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/Evaluators/index.tsx
@@ -22,8 +22,6 @@ type EvaluatorsProps = {
     onSuccess: () => void
     setEvaluatorsDisplay: any
     evaluatorsDisplay: string
-    setSelectedEvaluatorCategory: React.Dispatch<React.SetStateAction<string>>
-    selectedEvaluatorCategory: string
 }
 
 const useStyles = createUseStyles((theme: JSSTheme) => ({
@@ -74,13 +72,12 @@ const Evaluators = ({
     setCloneConfig,
     setEvaluatorsDisplay,
     evaluatorsDisplay,
-    selectedEvaluatorCategory,
-    setSelectedEvaluatorCategory,
 }: EvaluatorsProps) => {
     const classes = useStyles()
     const [searchTerm, setSearchTerm] = useState("")
     const evaluatorTags = getEvaluatorTags()
     const evaluators = useAtom(evaluatorsAtom)[0]
+    const [selectedEvaluatorCategory, setSelectedEvaluatorCategory] = useState("view_all")
 
     const updatedEvaluatorConfigs = useMemo(() => {
         return evaluatorConfigs.map((config) => {
@@ -128,7 +125,7 @@ const Evaluators = ({
                 <div>
                     <div className="flex items-center justify-between">
                         <Radio.Group
-                            defaultValue={"view_all"}
+                            defaultValue={selectedEvaluatorCategory}
                             className={classes.radioBtnContainer}
                             onChange={(e) => setSelectedEvaluatorCategory(e.target.value)}
                         >
diff --git a/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/EvaluatorsModal.tsx b/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/EvaluatorsModal.tsx
index c1404b6114..02a88dcea8 100644
--- a/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/EvaluatorsModal.tsx
+++ b/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/EvaluatorsModal.tsx
@@ -68,7 +68,6 @@ const EvaluatorsModal = ({
         "evaluator_view",
         "list",
     )
-    const [selectedEvaluatorCategory, setSelectedEvaluatorCategory] = useState("view_all")
     const [selectedTestset, setSelectedTestset] = useState("")
 
     const evalConfigFetcher = () => {
@@ -114,8 +113,6 @@ const EvaluatorsModal = ({
                     setCloneConfig={setCloneConfig}
                     setEvaluatorsDisplay={setEvaluatorsDisplay}
                     evaluatorsDisplay={evaluatorsDisplay}
-                    selectedEvaluatorCategory={selectedEvaluatorCategory}
-                    setSelectedEvaluatorCategory={setSelectedEvaluatorCategory}
                 />
             ),
         },
@@ -128,8 +125,6 @@ const EvaluatorsModal = ({
                     setSelectedEvaluator={setSelectedEvaluator}
                     setEvaluatorsDisplay={setEvaluatorsDisplay}
                     evaluatorsDisplay={evaluatorsDisplay}
-                    selectedEvaluatorCategory={selectedEvaluatorCategory}
-                    setSelectedEvaluatorCategory={setSelectedEvaluatorCategory}
                 />
             ),
         },
diff --git a/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/NewEvaluator/index.tsx b/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/NewEvaluator/index.tsx
index 972c3efc20..a6a426e879 100644
--- a/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/NewEvaluator/index.tsx
+++ b/agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/NewEvaluator/index.tsx
@@ -15,8 +15,6 @@ type NewEvaluatorProps = {
     setSelectedEvaluator: React.Dispatch<React.SetStateAction<Evaluator | null>>
     setEvaluatorsDisplay: any
     evaluatorsDisplay: string
-    setSelectedEvaluatorCategory: React.Dispatch<React.SetStateAction<string>>
-    selectedEvaluatorCategory: string
 }
 
 const useStyles = createUseStyles((theme: JSSTheme) => ({
@@ -62,12 +60,11 @@ const NewEvaluator = ({
     setSelectedEvaluator,
     setEvaluatorsDisplay,
     evaluatorsDisplay,
-    selectedEvaluatorCategory,
-    setSelectedEvaluatorCategory,
 }: NewEvaluatorProps) => {
     const classes = useStyles()
     const [searchTerm, setSearchTerm] = useState("")
     const evaluatorTags = getEvaluatorTags()
+    const [selectedEvaluatorCategory, setSelectedEvaluatorCategory] = useState("view_all")
 
     const filteredEvaluators = useMemo(() => {
         let filtered = evaluators
@@ -103,7 +100,7 @@ const NewEvaluator = ({
                 <div>
                     <div className="flex items-center justify-between">
                         <Radio.Group
-                            defaultValue={"view_all"}
+                            defaultValue={selectedEvaluatorCategory}
                             className={classes.radioBtnContainer}
                             onChange={(e) => setSelectedEvaluatorCategory(e.target.value)}
                         >