diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 2867f7d32b..88c55154a3 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -112,8 +112,13 @@ namespace Content.Server.RoundEnd
         /// </summary>
         public EntityUid? GetCentcomm()
         {
-            AllEntityQuery<StationCentcommComponent>().MoveNext(out var centcomm);
-            return centcomm == null ? null : _mapManager.GetMapEntityId(centcomm.MapId);
+            if (AllEntityQuery<StationCentcommComponent, TransformComponent>()
+                .MoveNext(out var centcomm, out var xform))
+            {
+                return xform.MapUid;
+            }
+
+            return null;
         }
 
         public bool CanCallOrRecall()