diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 88a7025fa1..975a7366c3 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -333,12 +333,12 @@ namespace Content.Server.GameTicking
                     // Finish
                     var antag = mind.AllRoles.Any(role => role.Antagonist);
 
-                    var playerIcName = string.Empty;
+                    var playerIcName = "Unknown";
 
                     if (mind.CharacterName != null)
                         playerIcName = mind.CharacterName;
-                    else if (mind.CurrentEntity != null)
-                        playerIcName = EntityManager.GetComponent<MetaDataComponent>(mind.CurrentEntity.Value).EntityName;
+                    else if (mind.CurrentEntity != null && TryName(mind.CurrentEntity.Value, out var icName))
+                        playerIcName = icName;
 
                     var playerEndRoundInfo = new RoundEndMessageEvent.RoundEndPlayerInfo()
                     {