diff --git a/src/lib/Client.ts b/src/lib/Client.ts
index c6a45c96d..bc26c71da 100644
--- a/src/lib/Client.ts
+++ b/src/lib/Client.ts
@@ -78,6 +78,8 @@ export class Client<ContentTypes> {
         )
 
         XMTPModule.emitter.addListener('authed', async () => {
+          this.removeSubscription(enableSubscription)
+          this.removeSubscription(createSubscription)
           const address = await signer.getAddress()
           resolve(new Client(address, opts?.codecs || []))
         })
@@ -89,8 +91,6 @@ export class Client<ContentTypes> {
           Boolean(enableSubscription)
         )
       })()
-      this.removeSubscription(enableSubscription)
-      this.removeSubscription(createSubscription)
     })
   }