1 files changed, 14 insertions, 1 deletions
diff --git a/src/state/shell/composer/useComposerKeyboardShortcut.tsx b/src/state/shell/composer/useComposerKeyboardShortcut.tsx
index 01306e36e..cfec5c445 100644
--- a/src/state/shell/composer/useComposerKeyboardShortcut.tsx
+++ b/src/state/shell/composer/useComposerKeyboardShortcut.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 import {useDialogStateContext} from '#/state/dialogs'
 import {useLightbox} from '#/state/lightbox'
 import {useModals} from '#/state/modals'
+import {useSession} from '#/state/session'
 import {useIsDrawerOpen} from '#/state/shell/drawer-open'
 import {useComposerControls} from './'
 
@@ -43,8 +44,13 @@ export function useComposerKeyboardShortcut() {
   const {isModalActive} = useModals()
   const {activeLightbox} = useLightbox()
   const isDrawerOpen = useIsDrawerOpen()
+  const {hasSession} = useSession()
 
   React.useEffect(() => {
+    if (!hasSession) {
+      return
+    }
+
     function handler(event: KeyboardEvent) {
       if (shouldIgnore(event)) return
       if (
@@ -60,5 +66,12 @@ export function useComposerKeyboardShortcut() {
     }
     document.addEventListener('keydown', handler)
     return () => document.removeEventListener('keydown', handler)
-  }, [openComposer, isModalActive, openDialogs, activeLightbox, isDrawerOpen])
+  }, [
+    openComposer,
+    isModalActive,
+    openDialogs,
+    activeLightbox,
+    isDrawerOpen,
+    hasSession,
+  ])
 }