diff --git a/src/components/pages/production/recording/form/RecordingForm.schema.ts b/src/components/pages/production/recording/form/RecordingForm.schema.ts
index 82b59036..063c2cc0 100644
--- a/src/components/pages/production/recording/form/RecordingForm.schema.ts
+++ b/src/components/pages/production/recording/form/RecordingForm.schema.ts
@@ -33,16 +33,16 @@ type RecordingGrowingFormSchemaType = {
     qty: number | string;
   }[];
   depletions: {
-    product_warehouse_id: number;
-    qty: number | string;
+    product_warehouse_id?: number;
+    qty?: number | string;
   }[];
 };
 
 type RecordingLayingFormSchemaType = RecordingGrowingFormSchemaType & {
   eggs: {
-    product_warehouse_id: number;
-    qty: number | string;
-    weight: number | string;
+    product_warehouse_id?: number;
+    qty?: number | string;
+    weight?: number | string;
   }[];
 };
 
@@ -52,14 +52,14 @@ export type StockSchema = {
 };
 
 export type DepletionSchema = {
-  product_warehouse_id: number;
-  qty: number | string;
+  product_warehouse_id?: number;
+  qty?: number | string;
 };
 
 export type EggSchema = {
-  product_warehouse_id: number;
-  qty: number | string;
-  weight: number | string;
+  product_warehouse_id?: number;
+  qty?: number | string;
+  weight?: number | string;
 };
 
 const StockObjectSchema: Yup.ObjectSchema<StockSchema> = Yup.object({
@@ -75,28 +75,19 @@ const StockObjectSchema: Yup.ObjectSchema<StockSchema> = Yup.object({
 
 const DepletionObjectSchema: Yup.ObjectSchema<DepletionSchema> = Yup.object({
   product_warehouse_id: Yup.number()
-    .required('Produk depletions wajib diisi!')
-    .min(1, 'Produk depletions wajib diisi!')
-    .typeError('Produk depletions harus berupa angka!'),
+    .optional()
+    .typeError('Depletions harus berupa angka!'),
   qty: Yup.number()
-    .required('Jumlah depletions wajib diisi!')
-    .min(1, 'Jumlah depletions minimal 1!')
+    .optional()
     .typeError('Jumlah depletions harus berupa angka!'),
 });
 
 const EggObjectSchema: Yup.ObjectSchema<EggSchema> = Yup.object({
   product_warehouse_id: Yup.number()
-    .required('Kondisi telur wajib diisi!')
-    .min(1, 'Kondisi telur wajib diisi!')
+    .optional()
     .typeError('Kondisi telur harus berupa angka!'),
-  qty: Yup.number()
-    .required('Jumlah telur wajib diisi!')
-    .min(1, 'Jumlah telur tidak boleh 0!')
-    .typeError('Jumlah telur harus berupa angka!'),
-  weight: Yup.number()
-    .required('Berat telur wajib diisi!')
-    .min(1, 'Berat telur minimal 1 gram!')
-    .typeError('Berat telur harus berupa angka!'),
+  qty: Yup.number().optional().typeError('Jumlah telur harus berupa angka!'),
+  weight: Yup.number().optional().typeError('Berat telur harus berupa angka!'),
 });
 
 export const RecordingGrowingFormSchema: Yup.ObjectSchema<RecordingGrowingFormSchemaType> =
@@ -163,18 +154,12 @@ export const RecordingGrowingFormSchema: Yup.ObjectSchema<RecordingGrowingFormSc
       .of(StockObjectSchema)
       .min(1, 'Minimal harus ada 1 data stok!')
       .required('Data stok wajib diisi!'),
-    depletions: Yup.array()
-      .of(DepletionObjectSchema)
-      .min(1, 'Minimal harus ada 1 data depletions!')
-      .required('Data depletions wajib diisi!'),
+    depletions: Yup.array().of(DepletionObjectSchema).default([]),
   });
 
 export const RecordingLayingFormSchema: Yup.ObjectSchema<RecordingLayingFormSchemaType> =
   RecordingGrowingFormSchema.shape({
-    eggs: Yup.array()
-      .of(EggObjectSchema)
-      .min(1, 'Minimal harus ada 1 data telur!')
-      .required('Data telur wajib diisi!'),
+    eggs: Yup.array().of(EggObjectSchema).default([]),
   });
 
 export const UpdateRecordingGrowingFormSchema =
diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index 5044dec5..17a1d020 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -309,6 +309,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
   // ===== PAYLOAD CREATION HELPERS =====
   const createGrowingPayload = useCallback(
     (values: RecordingGrowingFormValues) => {
+      const depletions = values.depletions
+        ?.filter((d) => d.product_warehouse_id && d.qty)
+        .map((depletion) => ({
+          product_warehouse_id: depletion.product_warehouse_id!,
+          qty: Number(depletion.qty) || 0,
+        }));
+
       return {
         project_flock_kandang_id: values.project_flock_kandang_id,
         record_date: values.record_date,
@@ -316,10 +323,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
           product_warehouse_id: stock.product_warehouse_id,
           qty: Number(stock.qty) || 0,
         })),
-        depletions: (values.depletions ?? []).map((depletion) => ({
-          product_warehouse_id: depletion.product_warehouse_id,
-          qty: Number(depletion.qty) || 0,
-        })),
+        ...(depletions && depletions.length > 0 && { depletions }),
       };
     },
     []
@@ -327,25 +331,33 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
 
   const createLayingPayload = useCallback(
     (values: RecordingLayingFormValues) => {
-      return {
-        project_flock_kandang_id: values.project_flock_kandang_id,
-        record_date: values.record_date,
-        stocks: (values.stocks ?? []).map((stock) => ({
-          product_warehouse_id: stock.product_warehouse_id,
-          qty: Number(stock.qty) || 0,
-        })),
-        depletions: (values.depletions ?? []).map((depletion) => ({
-          product_warehouse_id: depletion.product_warehouse_id,
+      const depletions = values.depletions
+        ?.filter((d) => d.product_warehouse_id && d.qty)
+        .map((depletion) => ({
+          product_warehouse_id: depletion.product_warehouse_id!,
           qty: Number(depletion.qty) || 0,
-        })),
-        eggs: (values.eggs ?? []).map((egg) => ({
-          product_warehouse_id: egg.product_warehouse_id,
+        }));
+
+      const eggs = values.eggs
+        ?.filter((e) => e.product_warehouse_id && e.qty && e.weight)
+        .map((egg) => ({
+          product_warehouse_id: egg.product_warehouse_id!,
           qty: Number(egg.qty) || 0,
           weight:
             typeof egg.weight === 'number'
               ? egg.weight
               : parseFloat(String(egg.weight)) || 0,
+        }));
+
+      return {
+        project_flock_kandang_id: values.project_flock_kandang_id,
+        record_date: values.record_date,
+        stocks: values.stocks.map((stock) => ({
+          product_warehouse_id: stock.product_warehouse_id,
+          qty: Number(stock.qty) || 0,
         })),
+        ...(depletions && depletions.length > 0 && { depletions }),
+        ...(eggs && eggs.length > 0 && { eggs }),
       };
     },
     []
@@ -1692,12 +1704,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
             <AlertErrorList formErrorList={formErrorList} onClose={close} />
           )}
 
-          <div className='text-xs text-error'>
-            {JSON.stringify(formik.errors)}
-          </div>
-          <div className='text-xs text-success'>
-            {JSON.stringify(formik.values)}
-          </div>
           {/* Basic Info Card */}
           {(type === 'add' || type === 'edit') && (
             <Card
@@ -2557,24 +2563,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                         />
                       </th>
                     )}
-                    <th>
-                      Kondisi
-                      <span
-                        className='tooltip tooltip-error tooltip-bottom '
-                        data-tip='required'
-                      >
-                        <span className='text-error'>*</span>
-                      </span>
-                    </th>
-                    <th>
-                      Jumlah
-                      <span
-                        className='tooltip tooltip-error tooltip-bottom '
-                        data-tip='required'
-                      >
-                        <span className='text-error'>*</span>
-                      </span>
-                    </th>
+                    <th>Kondisi</th>
+                    <th>Jumlah</th>
                     {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
                       <th>Action</th>
                     )}
@@ -2652,7 +2642,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                       </td>
                       <td>
                         <NumberInput
-                          required
                           name={`depletions.${idx}.qty`}
                           value={depletion.qty ?? ''}
                           onChange={handleDepletionQtyChangeWrapper(idx)}
@@ -2768,33 +2757,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                           />
                         </th>
                       )}
-                      <th>
-                        Kondisi Telur
-                        <span
-                          className='tooltip tooltip-error tooltip-bottom '
-                          data-tip='required'
-                        >
-                          <span className='text-error'>*</span>
-                        </span>
-                      </th>
-                      <th>
-                        Jumlah
-                        <span
-                          className='tooltip tooltip-error tooltip-bottom '
-                          data-tip='required'
-                        >
-                          <span className='text-error'>*</span>
-                        </span>
-                      </th>
-                      <th>
-                        Berat (gram)
-                        <span
-                          className='tooltip tooltip-error tooltip-bottom '
-                          data-tip='required'
-                        >
-                          <span className='text-error'>*</span>
-                        </span>
-                      </th>
+                      <th>Kondisi Telur</th>
+                      <th>Jumlah</th>
+                      <th>Berat (gram)</th>
                       {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
                         <th>Action</th>
                       )}
@@ -2829,7 +2794,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                           )}
                           <td>
                             <SelectInput
-                              required
                               value={
                                 eggProducts.find(
                                   (product) =>
@@ -2872,7 +2836,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                           </td>
                           <td>
                             <NumberInput
-                              required
                               name={`eggs.${idx}.qty`}
                               value={egg.qty ?? ''}
                               onChange={handleEggQtyChangeWrapper(idx)}
@@ -2897,7 +2860,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                           </td>
                           <td>
                             <NumberInput
-                              required
                               name={`eggs.${idx}.weight`}
                               value={egg.weight ?? ''}
                               onChange={handleEggWeightChangeWrapper(idx)}
diff --git a/src/types/api/production/recording.d.ts b/src/types/api/production/recording.d.ts
index 928afae0..eb611a3b 100644
--- a/src/types/api/production/recording.d.ts
+++ b/src/types/api/production/recording.d.ts
@@ -111,15 +111,15 @@ export type CreateGrowingRecordingPayload = {
     qty: number;
   }[];
   depletions?: {
-    product_warehouse_id: number;
-    qty: number;
+    product_warehouse_id?: number;
+    qty?: number;
   }[];
 };
 
 export type CreateEggPayload = {
-  product_warehouse_id: number;
-  qty: number;
-  weight: number;
+  product_warehouse_id?: number;
+  qty?: number;
+  weight?: number;
 };
 
 export type CreateLayingRecordingPayload = CreateGrowingRecordingPayload & {