diff --git a/libs/oeth/swap/src/actions/index.ts b/libs/oeth/swap/src/actions/index.ts
index d82441d44..f915c2cab 100644
--- a/libs/oeth/swap/src/actions/index.ts
+++ b/libs/oeth/swap/src/actions/index.ts
@@ -5,10 +5,10 @@ import redeemMix from './redeemMix';
 import type { SwapAction, SwapApi } from '../types';
 
 export const swapActions: Record<SwapAction, SwapApi> = {
-  'swap-curve': { ...defaultApi, ...mintVault },
-  'swap-zapper': { ...defaultApi, ...redeemMix },
-  'mint-vault': { ...defaultApi },
-  'redeem-mix': { ...defaultApi },
+  'swap-curve': { ...defaultApi },
+  'swap-zapper': { ...defaultApi },
+  'mint-vault': { ...defaultApi, ...mintVault },
+  'redeem-mix': { ...defaultApi, ...redeemMix },
   'wrap-oeth': { ...defaultApi },
   'unwrap-woeth': { ...defaultApi },
 };
diff --git a/libs/oeth/swap/src/hooks.ts b/libs/oeth/swap/src/hooks.ts
index aecc872c5..4ba6f084f 100644
--- a/libs/oeth/swap/src/hooks.ts
+++ b/libs/oeth/swap/src/hooks.ts
@@ -4,7 +4,11 @@ import { isNilOrEmpty } from '@origin/shared/utils';
 import { produce } from 'immer';
 
 import { useSwapState } from './state';
-import { getAllAvailableTokens, getAvailableTokensForSource } from './utils';
+import {
+  getAllAvailableTokens,
+  getAvailableRoutes,
+  getAvailableTokensForSource,
+} from './utils';
 
 import type { Token } from '@origin/shared/contracts';
 
@@ -79,6 +83,10 @@ export const useHandleTokenChange = () => {
               state.tokenIn = availableTokensIn[0];
             }
           }
+          state.swapRoute = getAvailableRoutes(
+            state.tokenIn,
+            state.tokenOut,
+          )[0];
         }),
       );
     },
@@ -103,11 +111,11 @@ export const useHandleTokenFlip = () => {
 };
 
 export const useHandleSwap = () => {
-  const [{ tokenIn, tokenOut, amountIn, swapRoute }] = useSwapState();
+  const [{ swapRoute }] = useSwapState();
 
   return useCallback(async () => {
     if (isNilOrEmpty(swapRoute)) {
       return;
     }
-  }, [amountIn, swapRoute, tokenIn, tokenOut]);
+  }, [swapRoute]);
 };