From 9d2a395be0d804e1c2a9f01d044ae130a3448d2a Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 16 May 2022 15:37:30 +1000
Subject: [PATCH] Fix chatbox crash (#8204)

---
 Content.Client/Chat/ChatSystem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

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);