diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs
index e07d2a401e..cc67d3a26c 100644
--- a/Content.Server/Chat/ChatManager.cs
+++ b/Content.Server/Chat/ChatManager.cs
@@ -1,13 +1,10 @@
 using System.Linq;
-using System.Net.Http;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;
 using Content.Shared.Chat;
 using Robust.Server.Interfaces.Player;
-using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Interfaces.Resources;
 using Robust.Shared.IoC;
 
 namespace Content.Server.Chat
@@ -57,6 +54,7 @@ namespace Content.Server.Chat
             msg.Channel = ChatChannel.Local;
             msg.Message = message;
             msg.MessageWrap = $"{source.Name} says, \"{{0}}\"";
+            msg.SenderEntity = source.Uid;
             _netManager.ServerSendToMany(msg, clients.ToList());
         }