diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
index a3998a0f45..923dc6c1de 100644
--- a/ccip/config/evm/Ronin_Mainnet.toml
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 1d419ac6f0..4669f13e1a 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
index a3998a0f45..923dc6c1de 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 1d419ac6f0..4669f13e1a 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index cdfde03871..c46c7158fe 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5707,7 +5707,7 @@ Enabled = false
 Enabled = true
 
 [GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'FeeHistory'
 PriceDefault = '21 gwei'
 PriceMax = '1 micro'
 PriceMin = '20 gwei'
@@ -5810,7 +5810,7 @@ Enabled = false
 Enabled = true
 
 [GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'FeeHistory'
 PriceDefault = '21 gwei'
 PriceMax = '1 micro'
 PriceMin = '20 gwei'