diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm
index 438370269e4..d7bb9f258ba 100644
--- a/code/controllers/subsystem/shuttles/emergency.dm
+++ b/code/controllers/subsystem/shuttles/emergency.dm
@@ -125,6 +125,7 @@
 					E << 'sound/effects/hyperspace_progress.ogg'
 				enterTransit()
 				mode = SHUTTLE_ESCAPE
+				launch_status = ENDGAME_LAUNCHED
 				timer = world.time
 				priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, null, "Priority")
 		if(SHUTTLE_ESCAPE)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index efe8e4883fd..0cf78685bd7 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -27,9 +27,8 @@
 		return 0
 
 	//check for centcomm shuttles
-	for(var/centcom_shuttle in list("emergency", "pod1", "pod2", "pod3", "pod4", "ferry"))
-		var/obj/docking_port/mobile/M = SSshuttle.getShuttle(centcom_shuttle)
-		if(T in M.areaInstance)
+	for(var/obj/docking_port/mobile/M in SSshuttle.mobile)
+		if(M.launch_status == ENDGAME_LAUNCHED && T in M.areaInstance)
 			return 1
 
 	//finally check for centcom itself