diff --git a/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx b/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
index c24a8cf3..50f4a5a0 100644
--- a/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
@@ -32,6 +32,7 @@ import Einsatzdetails, {
 } from "./_components/MissionMarkerTabs";
 import { useQuery } from "@tanstack/react-query";
 import { getMissionsAPI } from "querys/missions";
+import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
 
 export const MISSION_STATUS_COLORS: Record<MissionState | "attention", string> =
 	{
@@ -368,6 +369,8 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
 };
 
 export const MissionLayer = () => {
+	const dispatcherConnected =
+		useDispatchConnectionStore((s) => s.status) === "connected";
 	const { data: missions = [] } = useQuery({
 		queryKey: ["missions"],
 		queryFn: () =>
@@ -376,10 +379,17 @@ export const MissionLayer = () => {
 			}),
 	});
 
+	const filteredMissions = useMemo(() => {
+		if (!dispatcherConnected) {
+			return missions.filter((m: Mission) => m.state === "running");
+		}
+		return missions;
+	}, [missions, dispatcherConnected]);
+
 	// IDEA:  Add Marker to Map Layer / LayerGroup
 	return (
 		<>
-			{missions.map((mission) => {
+			{filteredMissions.map((mission) => {
 				return <MissionMarker key={mission.id} mission={mission as Mission} />;
 			})}
 		</>