diff --git a/src/hooks/swap/useSyncTokenDefaults.ts b/src/hooks/swap/useSyncTokenDefaults.ts
index f0450405f..95762611a 100644
--- a/src/hooks/swap/useSyncTokenDefaults.ts
+++ b/src/hooks/swap/useSyncTokenDefaults.ts
@@ -1,4 +1,4 @@
-import { Currency } from '@uniswap/sdk-core'
+import { Currency, TradeType } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { nativeOnChain } from 'constants/tokens'
 import { useToken } from 'hooks/useCurrency'
@@ -61,12 +61,12 @@ export default function useSyncTokenDefaults({
       amount: '',
       [Field.INPUT]: defaultInputToken,
       [Field.OUTPUT]: defaultOutputToken,
-      independentField: Field.INPUT,
+      type: TradeType.EXACT_INPUT,
     }
     if (defaultInputToken && defaultInputAmount) {
       defaultSwapState.amount = defaultInputAmount.toString()
     } else if (defaultOutputToken && defaultOutputAmount) {
-      defaultSwapState.independentField = Field.OUTPUT
+      defaultSwapState.type = TradeType.EXACT_OUTPUT
       defaultSwapState.amount = defaultOutputAmount.toString()
     }
     updateSwap((swap) => ({ ...swap, ...defaultSwapState }))
diff --git a/src/state/routing/slice.ts b/src/state/routing/slice.ts
index 3d24bf541..5f2323cc3 100644
--- a/src/state/routing/slice.ts
+++ b/src/state/routing/slice.ts
@@ -8,7 +8,6 @@ import { TradeType } from '@uniswap/sdk-core'
 import type { ChainId } from '@uniswap/smart-order-router'
 import ms from 'ms.macro'
 import qs from 'qs'
-import { isExactInput } from 'utils/tradeType'
 
 import { GetQuoteResult } from './types'
 
@@ -78,9 +77,7 @@ export const routing = createApi({
           // Lazy-load the clientside router to improve initial pageload times.
           return await (
             await import('../../hooks/routing/clientSideSmartOrderRouter')
-          ).getClientSideQuote({ ...args, type: isExactInput(tradeType) ? 'exactIn' : 'exactOut' }, provider, {
-            protocols,
-          })
+          ).getClientSideQuote(args, provider, { protocols })
         }
 
         let result