diff --git a/src/components/pages/uniformity/form/UniformityForm.tsx b/src/components/pages/uniformity/form/UniformityForm.tsx
index 1d558425..ffd50bdb 100644
--- a/src/components/pages/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/uniformity/form/UniformityForm.tsx
@@ -250,54 +250,46 @@ const UniformityForm = ({
   const handleLocationChange = useCallback(
     (val: OptionType | OptionType[] | null) => {
       const location = val as OptionType | null;
+      const locationId = Number(location?.value);
+
       formik.setFieldTouched('location', true);
       formik.setFieldValue('location', location);
       formik.setFieldTouched('location_id', true);
-      formik.setFieldValue('location_id', (location as OptionType)?.value || 0);
+      formik.setFieldValue('location_id', locationId);
 
       setSelectedLocation(location);
-      setSelectedProjectFlock(null);
-      setSelectedKandang(null);
-
-      formik.setFieldValue('project_flock', null);
-      formik.setFieldValue('project_flock_id', 0);
-      formik.setFieldValue('kandang', null);
-      formik.setFieldValue('kandang_id', 0);
     },
-    [formik]
+    []
   );
 
   const handleProjectFlockChange = useCallback(
     (val: OptionType | OptionType[] | null) => {
       const projectFlock = val as OptionType | null;
+      const projectFlockId = Number(projectFlock?.value);
+
       formik.setFieldTouched('project_flock', true);
       formik.setFieldValue('project_flock', projectFlock);
       formik.setFieldTouched('project_flock_id', true);
-      formik.setFieldValue(
-        'project_flock_id',
-        (projectFlock as OptionType)?.value || 0
-      );
+      formik.setFieldValue('project_flock_id', projectFlockId);
 
       setSelectedProjectFlock(projectFlock);
-      setSelectedKandang(null);
-
-      formik.setFieldValue('kandang', null);
-      formik.setFieldValue('kandang_id', 0);
     },
-    [formik]
+    []
   );
 
   const handleKandangChange = useCallback(
     (val: OptionType | OptionType[] | null) => {
       const kandang = val as OptionType | null;
+      const kandangId = Number(kandang?.value);
+
       formik.setFieldTouched('kandang', true);
       formik.setFieldValue('kandang', kandang);
       formik.setFieldTouched('kandang_id', true);
-      formik.setFieldValue('kandang_id', (kandang as OptionType)?.value || 0);
+      formik.setFieldValue('kandang_id', kandangId);
 
       setSelectedKandang(kandang);
     },
-    [formik]
+    []
   );
 
   const handleFileChange = useCallback(