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 b5e367ecec6..829dc02ccf8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
@@ -329,7 +329,7 @@ export default class ChatLivePane extends Component {
         messageData.expanded = !(messageData.hidden || messageData.deleted_at);
       }
 
-      // newest has to be in after fetcg callback as we don't want to make it
+      // newest has to be in after fetch callback as we don't want to make it
       // dynamic or it will make the pane jump around, it will disappear on reload
       if (
         !foundFirstNew &&
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
index 61d7c0033c5..232023c3f97 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
@@ -91,6 +91,8 @@ export default class ChatChannelsManager extends Service {
         if (channel) {
           channel.currentUserMembership.unread_count = 0;
           channel.currentUserMembership.unread_mentions = 0;
+          channel.currentUserMembership.last_read_message_id =
+            membership.last_read_message_id;
         }
       });
     });
diff --git a/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb b/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
index 760525d11c0..1f812604bf6 100644
--- a/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
@@ -6,7 +6,8 @@ RSpec.describe "Shortcuts | mark all read", type: :system, js: true do
   fab!(:channel_2) { Fabricate(:chat_channel) }
   fab!(:channel_3) { Fabricate(:chat_channel) }
 
-  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:chat_sidebar) { PageObjects::Pages::Sidebar.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
   let(:drawer) { PageObjects::Pages::ChatDrawer.new }
 
   before do
@@ -15,8 +16,9 @@ RSpec.describe "Shortcuts | mark all read", type: :system, js: true do
     sign_in(user_1)
     Fabricate(:chat_message, chat_channel: channel_1)
     Fabricate(:chat_message, chat_channel: channel_1)
-    Fabricate(:chat_message, chat_channel: channel_2)
-    Fabricate(:chat_message, chat_channel: channel_2)
+    10.times do |i|
+      Fabricate(:chat_message, chat_channel: channel_2, message: "all read message #{i}")
+    end
   end
 
   context "when chat is open" do
@@ -37,6 +39,9 @@ RSpec.describe "Shortcuts | mark all read", type: :system, js: true do
         expect(page).not_to have_css(
           ".sidebar-section-link.channel-#{channel_2.id} .sidebar-section-link-suffix.unread",
         )
+        chat_sidebar.open_channel(channel_2)
+        expect(page).to have_content("all read message 9")
+        expect(page).not_to have_content(I18n.t("js.chat.last_visit"))
       end
     end
   end