diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index 15e0b04650..ddda037c1e 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -582,6 +582,7 @@ export class Convo {
         error?.retry()
       },
     })
+    this.commit()
   }
 
   ingestFirehose(events: ChatBskyConvoGetLog.OutputSchema['logs']) {
diff --git a/src/state/messages/convo/index.tsx b/src/state/messages/convo/index.tsx
index 58e1c1956d..13e1f78e80 100644
--- a/src/state/messages/convo/index.tsx
+++ b/src/state/messages/convo/index.tsx
@@ -44,11 +44,15 @@ export function ConvoProvider({
   const events = useMessagesEventBus()
 
   React.useEffect(() => {
-    const remove = events.trailConvo(convoId, events => {
+    const trail = events.trailConvo(convoId, events => {
       convo.ingestFirehose(events)
     })
+    const onConnect = events.onConnect(convo.onFirehoseConnect)
+    const onError = events.onError(convo.onFirehoseError)
     return () => {
-      remove()
+      trail()
+      onConnect()
+      onError()
     }
   }, [convoId, convo, events])