diff --git a/src/actions/SendFormActions.js b/src/actions/SendFormActions.js
index cdea6602..d7a71825 100644
--- a/src/actions/SendFormActions.js
+++ b/src/actions/SendFormActions.js
@@ -389,14 +389,17 @@ export const setDefaultGasLimit = (): ThunkAction => (dispatch: Dispatch, getSta
     const { network } = getState().selectedAccount;
     if (!network) return;
 
+    const isToken = state.currency !== state.networkSymbol;
+    const gasLimit = isToken ? network.defaultGasLimitTokens.toString() : network.defaultGasLimit.toString();
+
     dispatch({
         type: SEND.CHANGE,
         state: {
             ...state,
             calculatingGasLimit: false,
             untouched: false,
-            touched: { ...state.touched, gasLimit: true },
-            gasLimit: network.defaultGasLimit.toString(),
+            touched: { ...state.touched, gasLimit: false },
+            gasLimit,
         },
     });
 };