diff --git a/ui/analyse/src/study/relay/chatHandler.ts b/ui/analyse/src/study/relay/chatHandler.ts
index 23d0296c863d7..ce8261aa4a779 100644
--- a/ui/analyse/src/study/relay/chatHandler.ts
+++ b/ui/analyse/src/study/relay/chatHandler.ts
@@ -6,6 +6,7 @@ export function broadcastChatHandler(ctrl: AnalyseCtrl): BroadcastChatHandler {
   const separator = '\ue666';
 
   const encodeMsg = (text: string): string => {
+    text = cleanMsg(text);
     if (ctrl.study?.relay && !ctrl.study.relay.tourShow()) {
       const chapterId = ctrl.study.currentChapter().id;
       const ply = ctrl.study.currentNode().ply;
diff --git a/ui/chat/src/ctrl.ts b/ui/chat/src/ctrl.ts
index 82d72b9a02d1b..6c408d8028236 100644
--- a/ui/chat/src/ctrl.ts
+++ b/ui/chat/src/ctrl.ts
@@ -105,8 +105,6 @@ export default class ChatCtrl {
       alert('Max length: 140 chars. ' + text.length + ' chars used.');
       return false;
     }
-    if (text.includes('\ue666')) return false;
-
     if (this.broadcastChatHandler) text = this.broadcastChatHandler.encodeMsg(text);
 
     site.pubsub.emit('socket.send', 'talk', text);
diff --git a/ui/chat/src/interfaces.ts b/ui/chat/src/interfaces.ts
index 03ca37c74f098..7adb5cb09f49b 100644
--- a/ui/chat/src/interfaces.ts
+++ b/ui/chat/src/interfaces.ts
@@ -56,7 +56,7 @@ export interface Line {
 }
 
 export interface BroadcastChatHandler {
-  encodeMsg(text: string): string;
+  encodeMsg(msg: string): string;
   cleanMsg(msg: string): string;
   jumpToMove(msg: string): void;
   canJumpToMove(msg: string): string | null;