diff --git a/src/containers/flight/NewFlightApprovalsContainer.js b/src/containers/flight/NewFlightApprovalsContainer.js
index 3341653d..fc07023b 100644
--- a/src/containers/flight/NewFlightApprovalsContainer.js
+++ b/src/containers/flight/NewFlightApprovalsContainer.js
@@ -75,7 +75,7 @@ export default function NewFlightApprovalsContainer({ mode }) {
     if (map) {
       window._mapbox = map;
       let mapInstance = mode === 'container' ? map : window.opener._mapbox;
-      setMapObject(map);
+      setMapObject(mapInstance);
     }
   }, [map]);
 
diff --git a/src/containers/flight/flightApprovalsContainer.js b/src/containers/flight/flightApprovalsContainer.js
index c3fe7606..894a8775 100644
--- a/src/containers/flight/flightApprovalsContainer.js
+++ b/src/containers/flight/flightApprovalsContainer.js
@@ -73,7 +73,7 @@ export default function FlightApprovalsContainer({ mode }) {
 
   useEffect(() => {
     if (map) {
-      setMapObject(mapInstance);
+      setMapObject(map);
     }
   }, [map]);