diff --git a/src/services/oauthService.ts b/src/services/oauthService.ts
index 968f8e2a0..f637845ba 100644
--- a/src/services/oauthService.ts
+++ b/src/services/oauthService.ts
@@ -329,6 +329,9 @@ export class OAuthService {
 
                 const receiveMessage = async (event: MessageEvent<any>) => {
                     try {
+                        if (!popup || event.source !== popup) {
+                            return; // Ignore messages not from our popup
+                        }
                         const result = await listener(event);
                         resolve(result);
                     }