diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index 9085cebfa366cda7c8721d823a991aece9dc816a..e662e2db8e204ed799f750e29c68cbfd103e785a 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -222,6 +222,9 @@ impl ChannelChat {
             let message = ChannelMessage::from_proto(response, &user_store, &mut cx).await?;
             this.update(&mut cx, |this, cx| {
                 this.insert_messages(SumTree::from_item(message, &()), cx);
+                if this.first_loaded_message_id.is_none() {
+                    this.first_loaded_message_id = Some(id);
+                }
             })?;
             Ok(id)
         }))