diff --git a/src/lib/gateway.ts b/src/lib/gateway.ts
index 2c1a871..b2256c1 100644
--- a/src/lib/gateway.ts
+++ b/src/lib/gateway.ts
@@ -137,7 +137,7 @@ export class GatewayClient {
         role,
         scopes,
         signedAtMs,
-        token: this.authToken || null,
+        token: this.authMode === 'password' ? null : (this.authToken || null),
         nonce,
       });
       const signature = await signPayload(this.deviceIdentity.keyPair.privateKey, payload);