diff --git a/apps/agentic-chat/src/components/tools/useSwapExecution.tsx b/apps/agentic-chat/src/components/tools/useSwapExecution.tsx
index 446a883d..448eb605 100644
--- a/apps/agentic-chat/src/components/tools/useSwapExecution.tsx
+++ b/apps/agentic-chat/src/components/tools/useSwapExecution.tsx
@@ -104,6 +104,12 @@ export const useSwapExecution = (
         ctx.setSubstatus('Requesting signature...')
         const swapTxHash = await executeSwap(swapTx, { solanaSigner })
         ctx.setMeta({ txHash: swapTxHash })
+
+        if (chainNamespace === CHAIN_NAMESPACE.Evm) {
+          ctx.setSubstatus('Waiting for confirmation...')
+          await waitForConfirmedReceipt(Number(chainReference), swapTxHash as `0x${string}`)
+        }
+
         ctx.advanceStep()
         ctx.markTerminal()
         ctx.persist()
diff --git a/apps/agentic-chat/src/utils/chains/evm/transaction.ts b/apps/agentic-chat/src/utils/chains/evm/transaction.ts
index fb86ddee..6fb7adc7 100644
--- a/apps/agentic-chat/src/utils/chains/evm/transaction.ts
+++ b/apps/agentic-chat/src/utils/chains/evm/transaction.ts
@@ -50,7 +50,7 @@ export async function sendEvmTransaction(params: TransactionParams): Promise<str
         value,
         data,
       })
-      if (!params.gasLimit) gas = estimatedGas
+      gas = gas !== undefined && gas > estimatedGas ? gas : estimatedGas
     } catch (error) {
       if (error instanceof SimulationError) throw error
       console.warn('[simulation] EVM simulation failed, proceeding without:', error)