diff --git a/src/containers/flight/NewFlightApprovalsContainer.js b/src/containers/flight/NewFlightApprovalsContainer.js
index 3cec5ae2..1aa31d97 100644
--- a/src/containers/flight/NewFlightApprovalsContainer.js
+++ b/src/containers/flight/NewFlightApprovalsContainer.js
@@ -297,14 +297,14 @@ export default function NewFlightApprovalsContainer({ mode }) {
 
       previewGeo2.features.push(circle);
 
-      mapObject.setCenter(circle.properties.center);
+      mapObject?.setCenter(circle.properties.center);
 
       fitZoomPaths = circleCoords[0];
 
       handlerFitBounds(mapObject, fitZoomPaths, 400, 'CIRCLE', 'flight');
 
       // mapObject.setPaintProperty('waypoint', 'circle-radius', 10);
-      mapObject.getSource('preview').setData(previewGeo2);
+      mapObject?.getSource('preview').setData(previewGeo2);
     }
   };
 
diff --git a/src/utility/MapUtils.js b/src/utility/MapUtils.js
index bf064151..23d6489f 100644
--- a/src/utility/MapUtils.js
+++ b/src/utility/MapUtils.js
@@ -163,9 +163,9 @@ export const handlerFitBounds = (map, paths, padding, type, page) => {
       window.innerWidth / 4,
       window.innerHeight / 4
     );
-    map.fitBounds(bounds, { padding: syncPadding, offset: { x: -150, y: 0 } });
+    map?.fitBounds(bounds, { padding: syncPadding, offset: { x: -150, y: 0 } });
   } else {
-    map.fitBounds(bounds, { padding: padding });
+    map?.fitBounds(bounds, { padding: padding });
   }
 };