1 files changed, 8 insertions, 0 deletions
diff --git a/src/view/com/modals/VerifyEmail.tsx b/src/view/com/modals/VerifyEmail.tsx
index 786a814a7..4f2b1aadf 100644
--- a/src/view/com/modals/VerifyEmail.tsx
+++ b/src/view/com/modals/VerifyEmail.tsx
@@ -22,6 +22,7 @@ import {Trans, msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useModalControls} from '#/state/modals'
 import {useSession, useSessionApi, getAgent} from '#/state/session'
+import {logger} from '#/logger'
 
 export const snapPoints = ['90%']
 
@@ -45,6 +46,13 @@ export function Component({showReminder}: {showReminder?: boolean}) {
   const {isMobile} = useWebMediaQueries()
   const {openModal, closeModal} = useModalControls()
 
+  React.useEffect(() => {
+    if (!currentAccount) {
+      logger.error(`VerifyEmail modal opened without currentAccount`)
+      closeModal()
+    }
+  }, [currentAccount, closeModal])
+
   const onSendEmail = async () => {
     setError('')
     setIsProcessing(true)