diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js
index 1f7457e556d..4df11aa0383 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js
@@ -6,6 +6,7 @@ export default class ChatChannelThreads extends DiscourseRoute {
   @service router;
   @service chatThreadListPane;
   @service chatStateManager;
+  @service chat;
 
   beforeModel(transition) {
     const channel = this.modelFor("chat.channel");
@@ -19,6 +20,11 @@ export default class ChatChannelThreads extends DiscourseRoute {
     this.chatStateManager.openSidePanel();
   }
 
+  @action
+  activate() {
+    this.chat.activeMessage = null;
+  }
+
   @action
   willTransition(transition) {
     if (