diff --git a/.changeset/flat-jokes-dream.md b/.changeset/flat-jokes-dream.md
new file mode 100644
index 0000000000..6a0df1cea9
--- /dev/null
+++ b/.changeset/flat-jokes-dream.md
@@ -0,0 +1,24 @@
+---
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+---
+
+Fix issue with broken states on swaps
diff --git a/packages/adapters/wagmi/src/client.ts b/packages/adapters/wagmi/src/client.ts
index f54b480c39..e95a57951b 100644
--- a/packages/adapters/wagmi/src/client.ts
+++ b/packages/adapters/wagmi/src/client.ts
@@ -229,6 +229,7 @@ export class WagmiAdapter extends AdapterBlueprint {
       chainId,
       type: 'legacy' as const
     }
+
     await prepareTransactionRequest(this.wagmiConfig, txParams)
     const tx = await wagmiSendTransaction(this.wagmiConfig, txParams)
     await waitForTransactionReceipt(this.wagmiConfig, { hash: tx, timeout: 25000 })
diff --git a/packages/core/src/controllers/SwapController.ts b/packages/core/src/controllers/SwapController.ts
index 0a52741e10..5269c49a5b 100644
--- a/packages/core/src/controllers/SwapController.ts
+++ b/packages/core/src/controllers/SwapController.ts
@@ -202,7 +202,7 @@ export const SwapController = {
       invalidSourceTokenAmount,
       availableToSwap:
         caipAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
-      isAuthConnector: type === 'AUTH'
+      isAuthConnector: type === 'ID_AUTH'
     }
   },
 
@@ -718,7 +718,8 @@ export const SwapController = {
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         value: BigInt(data.value),
-        gasPrice: BigInt(data.gasPrice)
+        gasPrice: BigInt(data.gasPrice),
+        chainNamespace: 'eip155'
       })
 
       await this.swapTokens()
@@ -770,7 +771,8 @@ export const SwapController = {
         data: data.data as `0x${string}`,
         gas: data.gas,
         gasPrice: BigInt(data.gasPrice),
-        value: data.value
+        value: data.value,
+        chainNamespace: 'eip155'
       })
 
       state.loadingTransaction = false