diff --git a/core/state_transition.go b/core/state_transition.go
index f84757be78..28d82929df 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -291,8 +291,8 @@ func (st *StateTransition) preCheck() error {
 
 	// Make sure that transaction gasFeeCap is greater than the baseFee (post london)
 	if st.evm.ChainConfig().IsLondon(st.evm.Context.BlockNumber) {
-		// Skip the checks if gas fields are zero and baseFee was explicitly disabled (eth_call)
-		if !st.evm.Config.NoBaseFee || msg.GasFeeCap.BitLen() > 0 || msg.GasTipCap.BitLen() > 0 {
+		// Skip the checks if explicitly disabled via (eth_call)
+		if !st.evm.Config.NoBaseFee {
 			if l := msg.GasFeeCap.BitLen(); l > 256 {
 				return fmt.Errorf("%w: address %v, maxFeePerGas bit length: %d", ErrFeeCapVeryHigh,
 					msg.From.Hex(), l)