diff --git a/Content.Client/Chat/ChatSystem.cs b/Content.Client/Chat/ChatSystem.cs
index 58b78eb2d0..48e7b41bae 100644
--- a/Content.Client/Chat/ChatSystem.cs
+++ b/Content.Client/Chat/ChatSystem.cs
@@ -28,6 +28,12 @@ public sealed class ChatSystem : SharedChatSystem
 
         foreach (var (ent, bubs) in bubbles)
         {
+            if (Deleted(ent))
+            {
+                SetBubbles(bubs, false);
+                continue;
+            }
+
             if (ent == player)
             {
                 SetBubbles(bubs, true);