diff --git a/packages/app/src/config.ts b/packages/app/src/config.ts
index f7801be9..a6c7cc20 100644
--- a/packages/app/src/config.ts
+++ b/packages/app/src/config.ts
@@ -18,7 +18,7 @@ export const SLIPPAGE_TOLERANCE = 0.005;
 /** Small network fee */
 export const NETWORK_FEE = 1;
 /** Default deadline */
-export const DEADLINE = 5000;
+export const DEADLINE = 99999999999;
 /** Max presentation units to avoid show 9 decimals on screen */
 export const FIXED_UNITS = 3;
 /** Min gas price required from the fuel-core */
diff --git a/packages/app/src/systems/Swap/utils/queries.ts b/packages/app/src/systems/Swap/utils/queries.ts
index 28fe086f..b4488993 100644
--- a/packages/app/src/systems/Swap/utils/queries.ts
+++ b/packages/app/src/systems/Swap/utils/queries.ts
@@ -1,6 +1,7 @@
 import type { SwapState } from '../types';
 import { ActiveInput } from '../types';
 
+import { DEADLINE } from '~/config';
 import { COIN_ETH } from '~/systems/Core';
 import type { TransactionCost } from '~/systems/Core/utils/gas';
 import { getOverrides } from '~/systems/Core/utils/gas';
@@ -57,7 +58,6 @@ export const swapTokens = async (
   { coinFrom, direction, amount }: SwapState,
   txCost: TransactionCost
 ) => {
-  const DEADLINE = 1000;
   if (direction === ActiveInput.to && amount) {
     const forwardAmount = await getSwapWithMaximumRequiredAmount(
       contract,
@@ -96,7 +96,6 @@ export const swapTokens = async (
 };
 
 export const queryNetworkFee = (contract: ExchangeContractAbi, direction?: ActiveInput) => {
-  const DEADLINE = 1000;
   const directionValue = direction || ActiveInput.from;
   if (directionValue === ActiveInput.to) {
     return contract.prepareCall.swap_with_maximum(1, DEADLINE, {