diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js b/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
index 9e512f17797..42044b58923 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
@@ -632,7 +632,7 @@ export default class ChatLivePane extends Component {
   handleRefreshMessage(data) {
     const message = this.args.channel.findMessage(data.chat_message.id);
     if (message) {
-      message.version = message.version + 1;
+      message.incrementVersion();
     }
   }
 
@@ -644,6 +644,7 @@ export default class ChatLivePane extends Component {
       message.excerpt = data.chat_message.excerpt;
       message.uploads = cloneJSON(data.chat_message.uploads || []);
       message.edited = true;
+      message.incrementVersion();
     }
   }
 
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-message.js b/plugins/chat/assets/javascripts/discourse/models/chat-message.js
index ed8d519e81a..1187c37f37b 100644
--- a/plugins/chat/assets/javascripts/discourse/models/chat-message.js
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-message.js
@@ -123,6 +123,10 @@ export default class ChatMessage {
     return this.channel?.messages?.objectAt?.(this.index + 1);
   }
 
+  incrementVersion() {
+    this.version++;
+  }
+
   react(emoji, action, actor, currentUserId) {
     const selfReaction = actor.id === currentUserId;
     const existingReaction = this.reactions.find(
diff --git a/plugins/chat/spec/system/edited_message_spec.rb b/plugins/chat/spec/system/edited_message_spec.rb
index 550b1ea9f15..930ef5a3f19 100644
--- a/plugins/chat/spec/system/edited_message_spec.rb
+++ b/plugins/chat/spec/system/edited_message_spec.rb
@@ -5,29 +5,41 @@ RSpec.describe "Edited message", type: :system, js: true do
   let(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
   fab!(:current_user) { Fabricate(:user) }
-  fab!(:editing_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:category_channel) }
-  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: editing_user) }
 
   before do
     chat_system_bootstrap
     channel_1.add(current_user)
-    channel_1.add(editing_user)
     sign_in(current_user)
   end
 
   context "when editing message" do
-    it "shows as edited for all users" do
-      chat_page.visit_channel(channel_1)
+    context "with multiple users in the channel" do
+      fab!(:editing_user) { Fabricate(:user) }
+      fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: editing_user) }
 
-      using_session(:user_1) do
-        sign_in(editing_user)
+      before { channel_1.add(editing_user) }
+
+      it "shows as edited for all users" do
         chat_page.visit_channel(channel_1)
-        channel_page.edit_message(message_1, "a different message")
+
+        using_session(:user_1) do
+          sign_in(editing_user)
+          chat_page.visit_channel(channel_1)
+          channel_page.edit_message(message_1, "a different message")
+          expect(page).to have_content(I18n.t("js.chat.edited"))
+        end
+
         expect(page).to have_content(I18n.t("js.chat.edited"))
       end
+    end
 
-      expect(page).to have_content(I18n.t("js.chat.edited"))
+    it "runs decorators on the edited message" do
+      message_1 = Fabricate(:chat_message, chat_channel: channel_1, user: current_user)
+      chat_page.visit_channel(channel_1)
+
+      channel_page.edit_message(message_1, '[date=2025-03-10 timezone="Europe/Paris"]')
+      expect(page).to have_css(".cooked-date")
     end
   end
 end