diff --git a/src/state/messages/events/index.tsx b/src/state/messages/events/index.tsx
index 6bf79232..d972c8c6 100644
--- a/src/state/messages/events/index.tsx
+++ b/src/state/messages/events/index.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import {AppState} from 'react-native'
 
 import {MessagesEventBus} from '#/state/messages/events/agent'
-import {useAgent} from '#/state/session'
+import {useAgent, useSession} from '#/state/session'
 
 const MessagesEventBusContext = React.createContext<MessagesEventBus | null>(
   null,
@@ -11,7 +11,9 @@ const MessagesEventBusContext = React.createContext<MessagesEventBus | null>(
 export function useMessagesEventBus() {
   const ctx = React.useContext(MessagesEventBusContext)
   if (!ctx) {
-    throw new Error('useChat must be used within a ChatProvider')
+    throw new Error(
+      'useMessagesEventBus must be used within a MessagesEventBusProvider',
+    )
   }
   return ctx
 }
@@ -20,6 +22,26 @@ export function MessagesEventBusProvider({
   children,
 }: {
   children: React.ReactNode
+}) {
+  const {currentAccount} = useSession()
+
+  if (!currentAccount) {
+    return (
+      <MessagesEventBusContext.Provider value={null}>
+        {children}
+      </MessagesEventBusContext.Provider>
+    )
+  }
+
+  return (
+    <MessagesEventBusProviderInner>{children}</MessagesEventBusProviderInner>
+  )
+}
+
+export function MessagesEventBusProviderInner({
+  children,
+}: {
+  children: React.ReactNode
 }) {
   const {getAgent} = useAgent()
   const [bus] = React.useState(