diff --git a/src/components/pages/production/recording/form/RecordingForm.schema.ts b/src/components/pages/production/recording/form/RecordingForm.schema.ts
index 063c2cc0..b39f94ca 100644
--- a/src/components/pages/production/recording/form/RecordingForm.schema.ts
+++ b/src/components/pages/production/recording/form/RecordingForm.schema.ts
@@ -164,6 +164,9 @@ export const RecordingLayingFormSchema: Yup.ObjectSchema<RecordingLayingFormSche
 
 export const UpdateRecordingGrowingFormSchema =
   RecordingGrowingFormSchema.shape({
+    location_id: Yup.number().nullable().optional(),
+    project_flock_id: Yup.number().nullable().optional(),
+    kandang_id: Yup.number().nullable().optional(),
     project_flock_kandang_id: Yup.number()
       .default(0)
       .typeError('Project Flock Kandang wajib diisi!')
@@ -176,6 +179,9 @@ export const UpdateRecordingGrowingFormSchema =
   });
 
 export const UpdateRecordingLayingFormSchema = RecordingLayingFormSchema.shape({
+  location_id: Yup.number().nullable().optional(),
+  project_flock_id: Yup.number().nullable().optional(),
+  kandang_id: Yup.number().nullable().optional(),
   project_flock_kandang_id: Yup.number()
     .default(0)
     .typeError('Project Flock Kandang wajib diisi!')
@@ -217,13 +223,25 @@ export const getRecordingGrowingFormInitialValues = (
   project_flock_id: 0,
   kandang: null,
   kandang_id: 0,
-  project_flock_kandang: initialValues?.project_flock_kandang_id
-    ? {
-        value: initialValues.project_flock_kandang_id,
-        label: `Project Flock #${initialValues.project_flock_kandang_id}`,
-      }
-    : null,
-  project_flock_kandang_id: initialValues?.project_flock_kandang_id ?? 0,
+  project_flock_kandang:
+    (initialValues?.project_flock_kandang_id ??
+    initialValues?.project_flock?.project_flock_kandang_id)
+      ? {
+          value:
+            initialValues?.project_flock_kandang_id ??
+            initialValues?.project_flock?.project_flock_kandang_id ??
+            0,
+          label: `Project Flock #${
+            initialValues?.project_flock_kandang_id ??
+            initialValues?.project_flock?.project_flock_kandang_id ??
+            0
+          }`,
+        }
+      : null,
+  project_flock_kandang_id:
+    initialValues?.project_flock_kandang_id ??
+    initialValues?.project_flock?.project_flock_kandang_id ??
+    0,
   stocks: initialValues?.stocks?.map((stock) => ({
     product_warehouse_id: stock.product_warehouse_id,
     qty: