diff --git a/src/components/pages/inventory/movement/form/MovementForm.schema.ts b/src/components/pages/inventory/movement/form/MovementForm.schema.ts
index ea6b473c..45658295 100644
--- a/src/components/pages/inventory/movement/form/MovementForm.schema.ts
+++ b/src/components/pages/inventory/movement/form/MovementForm.schema.ts
@@ -226,41 +226,62 @@ export const getMovementFormInitialValues = (
         }
       : null,
     destination_warehouse_id: initialValues?.destination_warehouse?.id ?? 0,
-    products:
-      initialValues?.details?.map((detail) => ({
-        product: {
-          value: detail.product.id,
-          label: detail.product.name,
-        },
-        product_id: detail.product.id,
-        product_qty: detail.quantity,
-      })) ?? [],
-    deliveries:
-      initialValues?.deliveries?.map((d) => ({
-        delivery_cost: d.shipping_cost_total ?? undefined,
-        delivery_cost_per_item: d.shipping_cost_item ?? undefined,
-        document_number: d.document_number ?? '',
-        document: d.document ?? null,
-        document_path: d.document_path ?? null,
-        driver_name: d.driver_name ?? '',
-        vehicle_plate: d.vehicle_plate ?? '',
-        supplier: d.supplier
-          ? { value: d.supplier.id, label: d.supplier.name }
-          : null,
-        supplier_id: d.supplier?.id ?? 0,
-        products:
-          d.items?.map((item) => {
-            const productData = detailIdToProductId.get(
-              item.stock_transfer_detail_id
-            );
-            return {
-              product: productData
-                ? { value: productData.id, label: productData.name }
-                : null,
-              product_id: productData?.id ?? 0,
-              product_qty: item.quantity,
-            };
-          }) ?? [],
-      })) ?? [],
+    products: initialValues?.details?.map((detail) => ({
+      product: {
+        value: detail.product.id,
+        label: detail.product.name,
+      },
+      product_id: detail.product.id,
+      product_qty: detail.quantity,
+    })) ?? [
+      {
+        product: null,
+        product_id: 0,
+        product_qty: '',
+      },
+    ],
+    deliveries: initialValues?.deliveries?.map((d) => ({
+      delivery_cost: d.shipping_cost_total ?? undefined,
+      delivery_cost_per_item: d.shipping_cost_item ?? undefined,
+      document: d.document ?? null,
+      document_path: d.document_path ?? null,
+      driver_name: d.driver_name ?? '',
+      vehicle_plate: d.vehicle_plate ?? '',
+      supplier: d.supplier
+        ? { value: d.supplier.id, label: d.supplier.name }
+        : null,
+      supplier_id: d.supplier?.id ?? 0,
+      products:
+        d.items?.map((item) => {
+          const productData = detailIdToProductId.get(
+            item.stock_transfer_detail_id
+          );
+          return {
+            product: productData
+              ? { value: productData.id, label: productData.name }
+              : null,
+            product_id: productData?.id ?? 0,
+            product_qty: item.quantity,
+          };
+        }) ?? [],
+    })) ?? [
+      {
+        delivery_cost: undefined,
+        delivery_cost_per_item: undefined,
+        document: null,
+        document_path: null,
+        driver_name: '',
+        vehicle_plate: '',
+        supplier: null,
+        supplier_id: 0,
+        products: [
+          {
+            product: null,
+            product_id: 0,
+            product_qty: '',
+          },
+        ],
+      },
+    ],
   };
 };
diff --git a/src/components/pages/inventory/movement/form/MovementForm.tsx b/src/components/pages/inventory/movement/form/MovementForm.tsx
index 6002aa55..df04cb53 100644
--- a/src/components/pages/inventory/movement/form/MovementForm.tsx
+++ b/src/components/pages/inventory/movement/form/MovementForm.tsx
@@ -761,8 +761,36 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       type !== 'edit' &&
       type !== 'detail'
     ) {
-      formik.setFieldValue('products', []);
-      formik.setFieldValue('deliveries', []);
+      if (formik.values.products.length === 0) {
+        formik.setFieldValue('products', [
+          {
+            product: null,
+            product_id: 0,
+            product_qty: '',
+          },
+        ]);
+      }
+      if (formik.values.deliveries.length === 0) {
+        formik.setFieldValue('deliveries', [
+          {
+            delivery_cost: undefined,
+            delivery_cost_per_item: undefined,
+            document: null,
+            document_path: null,
+            driver_name: '',
+            vehicle_plate: '',
+            supplier: null,
+            supplier_id: 0,
+            products: [
+              {
+                product: null,
+                product_id: 0,
+                product_qty: '',
+              },
+            ],
+          },
+        ]);
+      }
     }
   }, [formik.values.source_warehouse_id]);