diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
index 169170b..8f317ee 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
@@ -33,7 +33,21 @@ const EditController = ({ rowId, mutate, setOpenEditDialog, openEditDialog, row
             }}
         >
             <DialogTitle>ویرایش اطلاعات</DialogTitle>
-            <EditFormContent setOpenEditDialog={setOpenEditDialog} onSubmit={HandleSubmit} defaultData={row.original} />
+            <EditFormContent
+                setOpenEditDialog={setOpenEditDialog}
+                onSubmit={HandleSubmit}
+                defaultData={{
+                    before_image: row.original?.files[0]?.full_path_for_fast_react || null,
+                    after_image: row.original?.files[1]?.full_path_for_fast_react || null,
+                    item: row.original?.item || null,
+                    sub_item: row.original?.sub_item || null,
+                    amount: row.original?.sub_item_data || null,
+                    start_point: { lat: row.original?.start_lat || "", lng: row.original?.start_lng || "" },
+                    end_point: { lat: row.original?.end_lat || "", lng: row.original?.end_lng || "" },
+                    cmms_machines: row.original?.cmms_machines || null,
+                    rahdaran_id: row.original?.rahdaran || null,
+                }}
+            />
         </Dialog>
     );
 };
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
index 7bd5a49..37784dc 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
@@ -8,11 +8,11 @@ const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => {
     const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item);
 
     const defaultValues = {
-        before_image: defaultData?.files[0]?.full_path_for_fast_react || null,
-        after_image: defaultData?.files[1]?.full_path_for_fast_react || null,
-        amount: defaultData?.sub_item_data || null,
-        start_point: { lat: defaultData?.start_lat || "", lng: defaultData?.start_lng || "" },
-        end_point: { lat: defaultData?.end_lat || "", lng: defaultData?.end_lng || "" },
+        before_image: defaultData?.before_image || null,
+        after_image: defaultData?.after_image || null,
+        amount: defaultData?.amount || null,
+        start_point: defaultData?.start_point || { lat: "", lng: "" },
+        end_point: defaultData?.end_point || { lat: "", lng: "" },
         cmms_machines: defaultData?.cmms_machines || null,
         rahdaran_id: defaultData?.rahdaran || null,
     };
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx
index fef124f..4bd9a9c 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx
@@ -72,8 +72,8 @@ const EditFormCreate = ({ defaultData, subItem, onSubmitBase, defaultValues, set
                     <Stack>
                         {subItem.needs_image === 1 ? (
                             <ImageUpload
-                                afterImage={defaultData?.files[0]?.full_path_for_fast_react}
-                                beforeImage={defaultData?.files[1]?.full_path_for_fast_react}
+                                afterImage={defaultData?.afterImage}
+                                beforeImage={defaultData?.beforeImage}
                                 getValues={getValues}
                                 setValue={setValue}
                                 control={control}