From b784119f2e864a915848f8719d1245cf78ce794a Mon Sep 17 00:00:00 2001
From: Felix Zhang <felix.zhang@coinbase.com>
Date: Thu, 10 Jul 2025 11:34:53 -0700
Subject: [PATCH] Connection Issue

---
 packages/wallet-sdk/src/CoinbaseWalletProvider.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/wallet-sdk/src/CoinbaseWalletProvider.ts b/packages/wallet-sdk/src/CoinbaseWalletProvider.ts
index 589073e61f..62002f0c69 100644
--- a/packages/wallet-sdk/src/CoinbaseWalletProvider.ts
+++ b/packages/wallet-sdk/src/CoinbaseWalletProvider.ts
@@ -95,6 +95,7 @@ export class CoinbaseWalletProvider extends ProviderEventEmitter implements Prov
         switch (args.method) {
           case 'eth_requestAccounts': {
             let signerType: SignerType;
+
             const subAccountsConfig = store.subAccountsConfig.get();
             if (subAccountsConfig?.enableAutoSubAccounts) {
               signerType = 'scw';
@@ -103,7 +104,7 @@ export class CoinbaseWalletProvider extends ProviderEventEmitter implements Prov
             }
             const signer = this.initSigner(signerType);
 
-            if (signerType === 'scw') {
+            if (signerType === 'scw' && subAccountsConfig?.enableAutoSubAccounts) {
               await signer.handshake({ method: 'handshake' });
               // eth_requestAccounts gets translated to wallet_connect at SCWSigner level
               await signer.request(args);