diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index 5190b610..26a9aa1c 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -1520,10 +1520,52 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     formik.setFieldValue('location_id', locationId);
 
     setSelectedLocation(location);
+    formik.setFieldTouched('project_flock', false, false);
+    formik.setFieldValue('project_flock', null);
+    formik.setFieldTouched('project_flock_id', false, false);
+    formik.setFieldValue('project_flock_id', 0);
+    formik.setFieldTouched('kandang', false, false);
+    formik.setFieldValue('kandang', null);
+    formik.setFieldTouched('kandang_id', false, false);
+    formik.setFieldValue('kandang_id', 0);
+    formik.setFieldTouched('project_flock_kandang', false, false);
+    formik.setFieldValue('project_flock_kandang', null);
+    formik.setFieldTouched('project_flock_kandang_id', false, false);
+    formik.setFieldValue('project_flock_kandang_id', 0);
+    formik.setFieldTouched('stocks', false, false);
+    formik.setFieldValue('stocks', [
+      {
+        product_warehouse_id: 0,
+        qty: '',
+      },
+    ]);
+    formik.setFieldTouched('depletions', false, false);
+    formik.setFieldValue('depletions', [
+      {
+        product_warehouse_id: 0,
+        qty: '',
+      },
+    ]);
+    if (isLayingCategory) {
+      formik.setFieldTouched('eggs', false, false);
+      formik.setFieldValue('eggs', [
+        {
+          product_warehouse_id: 0,
+          qty: '',
+          weight: '',
+        },
+      ]);
+    }
+    setSelectedStocks([]);
+    setSelectedDepletions([]);
+    setSelectedEggs([]);
     setSelectedProjectFlock(null);
     setSelectedKandang(null);
     setProductionStandards(null);
     setNextDayRecording(null);
+    setStockProductsLocationId('');
+    setDepletionProductsLocationId('');
+    setEggProductsLocationId('');
     if (duplicateErrorShown) {
       toast.dismiss();
       setDuplicateErrorShown(false);
@@ -1546,10 +1588,48 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     formik.setFieldTouched('project_flock_id', true);
     formik.setFieldValue('project_flock_id', projectFlockId);
 
+    formik.setFieldTouched('kandang', false, false);
+    formik.setFieldValue('kandang', null);
+    formik.setFieldTouched('kandang_id', false, false);
+    formik.setFieldValue('kandang_id', 0);
+    formik.setFieldTouched('project_flock_kandang', false, false);
+    formik.setFieldValue('project_flock_kandang', null);
+    formik.setFieldTouched('project_flock_kandang_id', false, false);
+    formik.setFieldValue('project_flock_kandang_id', 0);
+    formik.setFieldTouched('stocks', false, false);
+    formik.setFieldValue('stocks', [
+      {
+        product_warehouse_id: 0,
+        qty: '',
+      },
+    ]);
+    formik.setFieldTouched('depletions', false, false);
+    formik.setFieldValue('depletions', [
+      {
+        product_warehouse_id: 0,
+        qty: '',
+      },
+    ]);
+    if (isLayingCategory) {
+      formik.setFieldTouched('eggs', false, false);
+      formik.setFieldValue('eggs', [
+        {
+          product_warehouse_id: 0,
+          qty: '',
+          weight: '',
+        },
+      ]);
+    }
+    setSelectedStocks([]);
+    setSelectedDepletions([]);
+    setSelectedEggs([]);
     setSelectedProjectFlock(projectFlock);
     setSelectedKandang(null);
     setProductionStandards(null);
     setNextDayRecording(null);
+    setStockProductsLocationId('');
+    setDepletionProductsLocationId('');
+    setEggProductsLocationId('');
     if (duplicateErrorShown) {
       toast.dismiss();
       setDuplicateErrorShown(false);
@@ -1569,6 +1649,33 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     formik.setFieldTouched('kandang_id', true);
     formik.setFieldValue('kandang_id', kandangId);
 
+    formik.setFieldTouched('stocks', false, false);
+    formik.setFieldValue('stocks', [
+      {
+        product_warehouse_id: 0,
+        qty: '',
+      },
+    ]);
+    formik.setFieldTouched('depletions', false, false);
+    formik.setFieldValue('depletions', [
+      {
+        product_warehouse_id: 0,
+        qty: '',
+      },
+    ]);
+    if (isLayingCategory) {
+      formik.setFieldTouched('eggs', false, false);
+      formik.setFieldValue('eggs', [
+        {
+          product_warehouse_id: 0,
+          qty: '',
+          weight: '',
+        },
+      ]);
+    }
+    setSelectedStocks([]);
+    setSelectedDepletions([]);
+    setSelectedEggs([]);
     setSelectedKandang(kandang);
     setProductionStandards(null);
     setNextDayRecording(null);