diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 62407598f3..4c7ad5e9b0 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -231,6 +231,8 @@ public sealed partial class ChatSystem : SharedChatSystem
         var (message, channel) = GetRadioPrefix(source, originalMessage);
 
         message = TransformSpeech(source, message);
+        if (message.Length == 0)
+            return;
 
         if (channel != null)
             _listener.PingListeners(source, message, channel);
@@ -249,11 +251,14 @@ public sealed partial class ChatSystem : SharedChatSystem
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}.");
     }
 
-    private void SendEntityWhisper(EntityUid source, string message, bool hideChat = false)
+    private void SendEntityWhisper(EntityUid source, string originalMessage, bool hideChat = false)
     {
         if (!_actionBlocker.CanSpeak(source)) return;
 
-        message = TransformSpeech(source, message);
+        var message = TransformSpeech(source, originalMessage);
+        if (message.Length == 0)
+            return;
+
         var obfuscatedMessage = ObfuscateMessageReadability(message, 0.2f);
 
         var transformSource = Transform(source);
@@ -289,7 +294,11 @@ public sealed partial class ChatSystem : SharedChatSystem
 
         var ev = new EntitySpokeEvent(message);
         RaiseLocalEvent(source, ev, false);
-        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}: {message}");
+
+        if (originalMessage == message)
+            _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}: {originalMessage}.");
+        else
+            _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}.");
     }
 
     private void SendEntityEmote(EntityUid source, string action, bool hideChat)