diff --git a/src/frontend/fmtm_openlayer_map/src/views/DefineAreaMap.jsx b/src/frontend/fmtm_openlayer_map/src/views/DefineAreaMap.jsx
index f2f4c65162..a76ee1095c 100644
--- a/src/frontend/fmtm_openlayer_map/src/views/DefineAreaMap.jsx
+++ b/src/frontend/fmtm_openlayer_map/src/views/DefineAreaMap.jsx
@@ -53,6 +53,7 @@ const DefineAreaMap = ({
         setDataExtractedGeojson(e.target.result);
       };
     } else {
+      setDataExtractedGeojson(null);
     }
   }, [uploadedDataExtractFile]);
   useEffect(() => {
@@ -63,6 +64,7 @@ const DefineAreaMap = ({
         setLineExtractedGeojson(e.target.result);
       };
     } else {
+      setLineExtractedGeojson(null);
     }
   }, [uploadedLineExtractFile]);
   return (
@@ -128,7 +130,7 @@ const DefineAreaMap = ({
               constrainResolution: true,
               duration: 2000,
             }}
-            // zoomToLayer
+            zoomToLayer
           />
         )}
         {lineExtractedGeojson && (
@@ -151,7 +153,7 @@ const DefineAreaMap = ({
               constrainResolution: true,
               duration: 2000,
             }}
-            // zoomToLayer
+            zoomToLayer
           />
         )}
       </MapComponent>
diff --git a/src/frontend/main/src/components/createproject/DataExtract.tsx b/src/frontend/main/src/components/createproject/DataExtract.tsx
index aec6af82ce..b99e47b4ef 100755
--- a/src/frontend/main/src/components/createproject/DataExtract.tsx
+++ b/src/frontend/main/src/components/createproject/DataExtract.tsx
@@ -76,6 +76,14 @@ const DataExtract: React.FC<any> = ({
     submission,
     DataExtractValidation,
   );
+  useEffect(() => {
+    if (values.data_extract_options === 'Data Extract Ways') {
+      setDataExtractFile(null);
+      setDataExtractFileValue(null);
+      setLineExtractFile(null);
+      setLineExtractFileValue(null);
+    }
+  }, [values.data_extract_options]);
 
   return (
     <CoreModules.Stack