diff --git a/src/app/components/LogInBunker.svelte b/src/app/components/LogInBunker.svelte
index 84b7674..9e72d40 100644
--- a/src/app/components/LogInBunker.svelte
+++ b/src/app/components/LogInBunker.svelte
@@ -32,9 +32,10 @@
     onNostrConnect: async (response: Nip46ResponseWithResult) => {
       const pubkey = await controller.broker.getPublicKey()
 
+      loginWithNip46(pubkey, controller.clientSecret, response.event.pubkey, SIGNER_RELAYS)
+
       await loadUserData(pubkey)
 
-      loginWithNip46(pubkey, controller.clientSecret, response.event.pubkey, SIGNER_RELAYS)
       setChecked("*")
       clearModals()
     },
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
index fff4e1a..580ccac 100644
--- a/src/app/core/state.ts
+++ b/src/app/core/state.ts
@@ -395,9 +395,13 @@ export const alerts = withGetter(
     filters: [{kinds: [ALERT_EMAIL, ALERT_WEB, ALERT_IOS, ALERT_ANDROID]}],
     itemToEvent: item => item.event,
     eventToItem: async event => {
-      const tags = parseJson(await decrypt(signer.get(), NOTIFIER_PUBKEY, event.content))
+      const $signer = signer.get()
 
-      return {event, tags}
+      if ($signer) {
+        const tags = parseJson(await decrypt($signer, NOTIFIER_PUBKEY, event.content))
+
+        return {event, tags}
+      }
     },
   }),
 )
@@ -425,9 +429,13 @@ export const alertStatuses = withGetter(
     filters: [{kinds: [ALERT_STATUS]}],
     itemToEvent: item => item.event,
     eventToItem: async event => {
-      const tags = parseJson(await decrypt(signer.get(), NOTIFIER_PUBKEY, event.content))
+      const $signer = signer.get()
 
-      return {event, tags}
+      if ($signer) {
+        const tags = parseJson(await decrypt($signer, NOTIFIER_PUBKEY, event.content))
+
+        return {event, tags}
+      }
     },
   }),
 )