diff --git a/tests/rpc_test.go b/tests/rpc_test.go
index fe3ae2906..81b4997d5 100644
--- a/tests/rpc_test.go
+++ b/tests/rpc_test.go
@@ -762,7 +762,7 @@ func TestEth_EstimateGas(t *testing.T) {
 	err := json.Unmarshal(rpcRes.Result, &gas)
 	require.NoError(t, err, string(rpcRes.Result))
 
-	require.Equal(t, "0xf552", gas)
+	require.Equal(t, "0xf54c", gas)
 }
 
 func TestEth_EstimateGas_ContractDeployment(t *testing.T) {
diff --git a/x/evm/types/chain_config.go b/x/evm/types/chain_config.go
index e0f7e92b9..1f9184ad0 100644
--- a/x/evm/types/chain_config.go
+++ b/x/evm/types/chain_config.go
@@ -85,8 +85,8 @@ func DefaultChainConfig() ChainConfig {
 		ByzantiumBlock:      sdk.ZeroInt(),
 		ConstantinopleBlock: sdk.ZeroInt(),
 		PetersburgBlock:     sdk.ZeroInt(),
-		IstanbulBlock:       sdk.NewInt(-1),
-		MuirGlacierBlock:    sdk.NewInt(-1),
+		IstanbulBlock:       sdk.ZeroInt(),
+		MuirGlacierBlock:    sdk.ZeroInt(),
 		YoloV2Block:         sdk.NewInt(-1),
 		EWASMBlock:          sdk.NewInt(-1),
 	}
diff --git a/x/evm/types/chain_config_test.go b/x/evm/types/chain_config_test.go
index 1fdbcf875..3d492794d 100644
--- a/x/evm/types/chain_config_test.go
+++ b/x/evm/types/chain_config_test.go
@@ -236,8 +236,8 @@ eip158_block: "0"
 byzantium_block: "0"
 constantinople_block: "0"
 petersburg_block: "0"
-istanbul_block: "-1"
-muir_glacier_block: "-1"
+istanbul_block: "0"
+muir_glacier_block: "0"
 yoloV2_block: "-1"
 ewasm_block: "-1"
 `