diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
index 9f6d3707804..5793692218d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
@@ -313,6 +313,7 @@ export default class ChatMessage extends Component {
     cancel(this._makeMessageActiveHandler);
     cancel(this._debounceDecorateCookedMessageHandler);
     this.#teardownMentionedUsers();
+    this.chat.activeMessage = null;
   }
 
   @action