diff --git a/src/frontend/src/components/DroneOperatorTask/DescriptionSection/DescriptionBox/index.tsx b/src/frontend/src/components/DroneOperatorTask/DescriptionSection/DescriptionBox/index.tsx
index fcc90b63..d68273ee 100644
--- a/src/frontend/src/components/DroneOperatorTask/DescriptionSection/DescriptionBox/index.tsx
+++ b/src/frontend/src/components/DroneOperatorTask/DescriptionSection/DescriptionBox/index.tsx
@@ -236,7 +236,12 @@ const DescriptionBox = () => {
               },
               {
                 name: 'Image Status',
-                value: formatString(taskAssetsInformation?.state),
+                value:
+                  // if the state is LOCKED_FOR_MAPPING and has a image count it means the images are not fully uploaded
+                  taskAssetsInformation?.state === 'LOCKED_FOR_MAPPING' &&
+                  taskAssetsInformation?.image_count > 0
+                    ? 'Image Uploading Failed'
+                    : formatString(taskAssetsInformation?.state),
               },
             ]}
           />
@@ -295,43 +300,45 @@ const DescriptionBox = () => {
               </Button>
             </div>
           )}
-          {taskAssetsInformation?.state === 'IMAGE_PROCESSING_FAILED' ||
-            (taskAssetsInformation?.state === 'IMAGE_UPLOADED' && (
-              <div className="naxatw-flex naxatw-flex-col naxatw-gap-1 naxatw-pb-4">
-                <Label>
-                  <p className="naxatw-text-[0.875rem] naxatw-font-semibold naxatw-leading-normal naxatw-tracking-[0.0175rem] naxatw-text-[#D73F3F]">
-                    Upload Images
-                  </p>
-                </Label>
-                <SwitchTab
-                  options={[
-                    {
-                      name: 'image-upload-for',
-                      value: 'add',
-                      label: 'Add to existing',
-                    },
-                    {
-                      name: 'image-upload-for',
-                      value: 'replace',
-                      label: 'Replace existing',
-                    },
-                  ]}
-                  valueKey="value"
-                  selectedValue={uploadedImageType}
-                  activeClassName="naxatw-bg-red naxatw-text-white"
-                  onChange={(selected: Record<string, any>) => {
-                    dispatch(setUploadedImagesType(selected.value));
-                  }}
-                />
-                <p className="naxatw-px-1 naxatw-py-1 naxatw-text-xs">
-                  Note:{' '}
-                  {uploadedImageType === 'add'
-                    ? 'Uploaded images will be added with the existing images.'
-                    : 'Uploaded images will be replaced with all the existing images and starts processing.'}
+          {(taskAssetsInformation?.state === 'IMAGE_PROCESSING_FAILED' ||
+            // if the state is LOCKED_FOR_MAPPING and has a image count it means all selected images are not uploaded and the status updating api call is interrupted so need to give user to upload the remaining images
+            taskAssetsInformation?.state === 'LOCKED_FOR_MAPPING' ||
+            taskAssetsInformation?.state === 'IMAGE_UPLOADED') && (
+            <div className="naxatw-flex naxatw-flex-col naxatw-gap-1 naxatw-pb-4">
+              <Label>
+                <p className="naxatw-text-[0.875rem] naxatw-font-semibold naxatw-leading-normal naxatw-tracking-[0.0175rem] naxatw-text-[#D73F3F]">
+                  Upload Images
                 </p>
-                <UploadsBox label="" />
-              </div>
-            ))}
+              </Label>
+              <SwitchTab
+                options={[
+                  {
+                    name: 'image-upload-for',
+                    value: 'add',
+                    label: 'Add to existing',
+                  },
+                  {
+                    name: 'image-upload-for',
+                    value: 'replace',
+                    label: 'Replace existing',
+                  },
+                ]}
+                valueKey="value"
+                selectedValue={uploadedImageType}
+                activeClassName="naxatw-bg-red naxatw-text-white"
+                onChange={(selected: Record<string, any>) => {
+                  dispatch(setUploadedImagesType(selected.value));
+                }}
+              />
+              <p className="naxatw-px-1 naxatw-py-1 naxatw-text-xs">
+                Note:{' '}
+                {uploadedImageType === 'add'
+                  ? 'Uploaded images will be added with the existing images.'
+                  : 'Uploaded images will be replaced with all the existing images and starts processing.'}
+              </p>
+              <UploadsBox label="" />
+            </div>
+          )}
         </div>
       )}
     </>
diff --git a/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx b/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx
index f7016b15..7b728d13 100644
--- a/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx
+++ b/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx
@@ -839,7 +839,7 @@ const MapSection = ({ className }: { className?: string }) => {
             getCoordOnProperties
           />
 
-          <div className="naxatw-absolute naxatw-right-3 naxatw-top-3 naxatw-z-40 lg:naxatw-right-64">
+          <div className="naxatw-absolute naxatw-right-3 naxatw-top-3 naxatw-z-10 lg:naxatw-right-64">
             <SwitchTab
               activeClassName="naxatw-bg-red naxatw-text-white"
               options={waypointModeOptions}