diff --git a/TorchRemote.Plugin/Controllers/ChatController.cs b/TorchRemote.Plugin/Controllers/ChatController.cs
index 9155b27..5b05c37 100644
--- a/TorchRemote.Plugin/Controllers/ChatController.cs
+++ b/TorchRemote.Plugin/Controllers/ChatController.cs
@@ -77,8 +77,9 @@ public class ChatController : WebApiController, IChatController
                 throw HttpException.BadRequest("Invalid channel and targetId combination");
         }
         
-        if (Statics.Torch.CurrentSession?.Managers.GetManager<IChatManagerServer>() is { } manager)
-            manager.DisplayMessageOnSelf(request.Author, request.Message);
+        if (Statics.Torch.CurrentSession?.Managers.GetManager<IChatManagerServer>() is { } manager && 
+            request.Channel is ChatChannel.Global or ChatChannel.GlobalScripted)
+            manager.DisplayMessageOnSelf(msg.CustomAuthorName, msg.Text);
     }
 
     [Route(HttpVerbs.Post, $"{RootPath}/command")]