diff --git a/apps/dispatch-server/socket-events/connect-dispatch.ts b/apps/dispatch-server/socket-events/connect-dispatch.ts
index 192fd25f..853e1d7c 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}`,
@@ -99,7 +99,7 @@ export const handleConnectDispatch =
 
 				io.to("dispatchers").emit("dispatchers-update");
 				io.to("pilots").emit("dispatchers-update");
-				if (discordAccount?.id) {
+				if (discordAccount?.id && !ghostMode) {
 					await renameMember(
 						discordAccount.discordId.toString(),
 						`${getPublicUser(user).fullName} - ${user.publicId}`,
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>