diff --git a/apps/dispatch/app/(dispatch)/_components/map/AircraftMarker.tsx b/apps/dispatch/app/(dispatch)/_components/map/AircraftMarker.tsx
index 5512161e..c13db02e 100644
--- a/apps/dispatch/app/(dispatch)/_components/map/AircraftMarker.tsx
+++ b/apps/dispatch/app/(dispatch)/_components/map/AircraftMarker.tsx
@@ -148,7 +148,9 @@ const AircraftLabel = ({ aircraft }: { aircraft: Aircraft }) => {
 	useEffect(() => {});
 
 	useEffect(() => {
-		handleLabelConflict();
+		setTimeout(() => {
+			handleLabelConflict();
+		}, 100);
 
 		map.on("zoom", handleLabelConflict);
 		return () => {
diff --git a/apps/dispatch/app/(dispatch)/_components/map/MissionMarkers.tsx b/apps/dispatch/app/(dispatch)/_components/map/MissionMarkers.tsx
index 87042c62..893317c4 100644
--- a/apps/dispatch/app/(dispatch)/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/(dispatch)/_components/map/MissionMarkers.tsx
@@ -38,6 +38,7 @@ export const MissionMarker = ({
 				});
 				// setSearchPopup(null);
 			} else {
+				console.log("close", mission.id);
 				setOpenMissionMarker({
 					open: [],
 					close: [mission.id],
@@ -49,7 +50,7 @@ export const MissionMarker = ({
 		return () => {
 			markerRef.current?.off("click", handleClick);
 		};
-	}, [markerRef.current, mission.id, setOpenMissionMarker]);
+	}, [markerRef.current, mission.id, setOpenMissionMarker, openMissionMarker]);
 
 	return (
 		<>