diff --git a/libs/shared/providers/src/gas/hooks.ts b/libs/shared/providers/src/gas/hooks.ts
index 569ac291c..38c498dc9 100644
--- a/libs/shared/providers/src/gas/hooks.ts
+++ b/libs/shared/providers/src/gas/hooks.ts
@@ -2,10 +2,15 @@ import { contracts } from '@origin/shared/contracts';
 import { useQuery } from '@tanstack/react-query';
 import { fetchFeeData, readContract } from '@wagmi/core';
 import { formatUnits } from 'viem';
+import { useBlockNumber } from 'wagmi';
+
+const GAS_MARGIN = 1.3;
 
 export const useGasPrice = (gasAmount = 0n) => {
+  const { data: blockNumber } = useBlockNumber();
+
   return useQuery({
-    queryKey: ['useGasPrice', gasAmount?.toString()],
+    queryKey: ['useGasPrice', gasAmount?.toString(), blockNumber?.toString()],
     queryFn: async () => {
       const [price, data] = await Promise.all([
         readContract({
@@ -17,12 +22,23 @@ export const useGasPrice = (gasAmount = 0n) => {
       ]);
 
       const gweiUsd = +formatUnits(price, 6) * 1e-9;
-      const gasPrice = +formatUnits(data.gasPrice, 9);
+      const gasPrice =
+        +formatUnits(data.gasPrice, 9) +
+        +formatUnits(data.maxPriorityFeePerGas, 9);
       const maxGasPrice = +formatUnits(data.maxFeePerGas, 9);
-      const gasCostUsd = Number(gasAmount) * gasPrice * gweiUsd;
-      const maxGasCost = Number(gasAmount) * maxGasPrice * gweiUsd;
+      const gasCostGwei = Number(gasAmount) * GAS_MARGIN * gasPrice;
+      const gasCostUsd = gasCostGwei * gweiUsd;
+      const maxGasCostGwei = Number(gasAmount) * GAS_MARGIN * maxGasPrice;
+      const maxGasCostUsd = maxGasCostGwei * gweiUsd;
 
-      return { gweiUsd, gasPrice, gasCostUsd, maxGasCost };
+      return {
+        gweiUsd,
+        gasPrice,
+        gasCostUsd,
+        gasCostGwei,
+        maxGasCostUsd,
+        maxGasCostGwei,
+      };
     },
   });
 };