diff --git a/apps/browser/src/content/webauthn/messaging/messenger.ts b/apps/browser/src/content/webauthn/messaging/messenger.ts
index 3b9f54d5464..9c42d87da5d 100644
--- a/apps/browser/src/content/webauthn/messaging/messenger.ts
+++ b/apps/browser/src/content/webauthn/messaging/messenger.ts
@@ -40,7 +40,9 @@ export class Messenger {
 
     const promise = firstValueFrom(
       this.channel.messages$.pipe(
-        filter((m) => m.metadata.requestId === requestId && m.type !== request.type)
+        filter(
+          (m) => m != undefined && m.metadata?.requestId === requestId && m.type !== request.type
+        )
       )
     );