diff --git a/src/Pages/EmpMaster/EmpMasterForm.jsx b/src/Pages/EmpMaster/EmpMasterForm.jsx
index 7005c09..05ffc5a 100644
--- a/src/Pages/EmpMaster/EmpMasterForm.jsx
+++ b/src/Pages/EmpMaster/EmpMasterForm.jsx
@@ -55,7 +55,7 @@ const EmployeeForm = ({ formType }) => {
   const [brId, setBrId] = useState(getSession('BranchId'));
   const [AppId, setAppId] = useState(getSession('AppId'));
   const [AdminUserId, setAdminUserId] = useState(getSession('UserId'));
-  const [ImageUrl, setImageUrl] = useState(null);
+  const [ProfileImageUrl, setProfileImageUrl] = useState(null);
   const [EmpTypeDropDownData, setEmpTypeDropDownData] = useState([]);
   const [seletedEmpTypeDrop, setseletedEmpTypeDrop] = useState(null);
   const [EmpDesgDropDownData, setEmpDesgDropDownData] = useState([]);
@@ -132,8 +132,8 @@ const EmployeeForm = ({ formType }) => {
     postData['EmpDOJ'] = moment(SelectedDate).format('YYYY-MM-DD');
     postData['BranchId'] = brId;
     postData['MobileAppAccess'] = SelectedMobApp ? SelectedMobApp : 'N';
-    postData['EmpPhotoLink'] = ImageUrl
-      ? ImageUrl
+    postData['EmpPhotoLink'] = ProfileImageUrl
+      ? ProfileImageUrl
       : 'https://api.pozo.app/pozo-common-image-api/upload?fileId=655c9e25fe20def9916edf1f.png';
     //  postData["Description"]=form?.getFieldValue("coachQualifications"),
     //  postData["Certification"]=form?.getFieldValue("coachQualifications"),
@@ -143,8 +143,8 @@ const EmployeeForm = ({ formType }) => {
     //   "Experience": form?.getFieldValue("coachExperience"),
     postData['ImageDetails'] =
       (imageUrls || [])
-        .filter((item) => item && (item.image || item.name))
-        .map((item, index) => ({
+        ?.filter((item) => item && (item.image || item.name))
+        ?.map((item, index) => ({
           ImageUrl: item.image || '',
           ImageType: item.name || '',
           // ImageType: "Coach",
@@ -202,9 +202,17 @@ const EmployeeForm = ({ formType }) => {
           setseletedEmpDeptDrop(editstate?.EmpDept);
           setseletedShiftDrop(editstate?.EmpShiftId);
           setSelectedDate(editstate?.EmpDOJ);
-          setImageUrl(editstate?.EmpPhotoLink);
+          setProfileImageUrl(editstate?.EmpPhotoLink);
           setSelectedLatitude(editstate?.Latitude);
           setSelectedLongitude(editstate?.Longitude);
+          if (editstate?.ImageDetails?.length > 0) {
+            setImageUrls(
+              editstate.ImageDetails.map((img) => ({
+                image: img.ImageUrl || '',
+                name: img.ImageType || '',
+              }))
+            );
+          }
           formRef.current?.setFieldsValue({
             EmpDOJ: moment(editstate?.EmpDOJ),
           });
@@ -245,8 +253,6 @@ const EmployeeForm = ({ formType }) => {
       };
       return copy;
     });
-
-    setImageUrl(url);
   };
 
   const updateImageName = (name, index = 0) => {
@@ -672,7 +678,7 @@ const EmployeeForm = ({ formType }) => {
   //   seletedEmpTypeDrop
 
   const updateImageUrl = (url) => {
-    setImageUrl(url);
+    setProfileImageUrl(url);
   };
 
   const selectValue = async (e) => {
@@ -1242,7 +1248,7 @@ const EmployeeForm = ({ formType }) => {
                                 formType === 'edit'
                                   ? editstate?.EmpPhotoLink
                                   : formRef.current?.getFieldsValue()
-                                      ?.UserImage || ImageUrl;
+                                      ?.UserImage || ProfileImageUrl;
                               // Always return a string
                               return typeof link === 'string' ? link : '';
                             })()}
@@ -1624,11 +1630,10 @@ const EmployeeForm = ({ formType }) => {
                             }
                           />
                         </Form.Item>
-
                         <div className="sports-masterimage">
-                          {Array.from({
-                            length: Math.max(1, imageUrls.length),
-                          }).map((_, idx) => (
+                          {Array?.from({
+                         length: Math.max(1, (imageUrls ?? []).length),
+                           })?.map((_, idx) =>  (
                             <div key={idx} style={{ marginBottom: 12 }}>
                               <div style={{ width: 'max-content' }}>
                                 <CropUpload