diff --git a/src/services/main/applicationManager.ts b/src/services/main/applicationManager.ts
index 39d7c38c..c076bad6 100644
--- a/src/services/main/applicationManager.ts
+++ b/src/services/main/applicationManager.ts
@@ -252,9 +252,13 @@ export default class {
     async GetNPubLinkingState(app_id: string, req: Types.GetNPubLinking): Promise<Types.NPubLinking> {
         const app = await this.storage.applicationStorage.GetApplication(app_id);
         const user = await this.storage.applicationStorage.GetApplicationUser(app, req.user_identifier);
-        const linking = Object.entries(this.nPubLinkingTokens).find(([_, data]) => data.serialId === user.serial_id)
-        if (linking) {
-            return { state: { type: Types.NPubLinking_state_type.LINKING_TOKEN, linking_token: linking[0] } }
+        const iter = this.nPubLinkingTokens.keys()
+        let result = iter.next()
+        while (!result.done) {
+            if (this.nPubLinkingTokens.get(result.value)?.serialId === user.serial_id) {
+                return { state: { type: Types.NPubLinking_state_type.LINKING_TOKEN, linking_token: result.value } }
+            }
+            result = iter.next()
         }
         if (user.nostr_public_key) {
             return { state: { type: Types.NPubLinking_state_type.LINKED_NPUB, linked_npub: user.nostr_public_key } }