diff --git a/apps/dispatch-server/routes/dispatcher.ts b/apps/dispatch-server/routes/dispatcher.ts
index 7adc9c6d..03cc314b 100644
--- a/apps/dispatch-server/routes/dispatcher.ts
+++ b/apps/dispatch-server/routes/dispatcher.ts
@@ -34,7 +34,7 @@ router.patch("/:id", async (req, res) => {
 		},
 	});
 
-	if (discordAccount?.id) {
+	if (discordAccount?.id && !disaptcherUpdate.ghostMode) {
 		await renameMember(
 			discordAccount.discordId.toString(),
 			`${getPublicUser(newDispatcher.user).fullName} • ${newDispatcher.zone}`,
diff --git a/apps/dispatch-server/socket-events/connect-dispatch.ts b/apps/dispatch-server/socket-events/connect-dispatch.ts
index 192fd25f..f2acb6c9 100644
--- a/apps/dispatch-server/socket-events/connect-dispatch.ts
+++ b/apps/dispatch-server/socket-events/connect-dispatch.ts
@@ -70,7 +70,7 @@ export const handleConnectDispatch =
 					userId: user.id,
 				},
 			});
-			if (discordAccount?.id) {
+			if (discordAccount?.id && !ghostMode) {
 				await renameMember(
 					discordAccount.discordId.toString(),
 					`${getPublicUser(user).fullName} • ${selectedZone}`,
diff --git a/apps/dispatch/app/_components/map/MissionMarkers.tsx b/apps/dispatch/app/_components/map/MissionMarkers.tsx
index a748bc69..92a0de35 100644
--- a/apps/dispatch/app/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/_components/map/MissionMarkers.tsx
@@ -253,7 +253,7 @@ const MissionMarker = ({
 							tab: "home",
 						},
 					],
-					close: openMissionMarker?.map((m) => m.id) || [],
+					close: [],
 				});
 			}
 		};
diff --git a/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx b/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
index 8dbcd078..249ff8b5 100644
--- a/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
+++ b/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
@@ -158,7 +158,7 @@ const PopupContent = ({
 						</span>
 						<span>
 							{aircraft.Station.bosCallsign.length > 15
-								? aircraft.Station.locationStateShort
+								? aircraft.Station.bosCallsignShort
 								: aircraft.Station.bosCallsign}
 						</span>
 					</div>
diff --git a/apps/dispatch/app/_store/audioStore.ts b/apps/dispatch/app/_store/audioStore.ts
index 0fb63b4d..b1b789c0 100644
--- a/apps/dispatch/app/_store/audioStore.ts
+++ b/apps/dispatch/app/_store/audioStore.ts
@@ -177,6 +177,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 					if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
 						changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
 							zone: roomName,
+							ghostMode: dispatchState.ghostMode,
 						});
 					}