diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index b57bc67195f7..8c9238991ef3 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -68,8 +68,13 @@ func (s *PublicEthereumAPI) GasPrice(ctx context.Context) (*hexutil.Big, error)
 	if err != nil {
 		return nil, err
 	}
-	if head := s.b.CurrentHeader(); head.BaseFee != nil {
-		tipcap.Add(tipcap, head.BaseFee)
+	bNrOrHash := rpc.BlockNumberOrHashWithNumber(rpc.PendingBlockNumber)
+	block, err := s.b.BlockByNumberOrHash(ctx, bNrOrHash)
+	if err != nil {
+		return &hexutil.Big{}, err
+	}
+	if block.BaseFee() != nil {
+		tipcap.Add(tipcap, block.BaseFee())
 	}
 	return (*hexutil.Big)(tipcap), err
 }
diff --git a/params/version.go b/params/version.go
index c523758cbe05..881b51ebecce 100644
--- a/params/version.go
+++ b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 7         // Minor version component of the current release
-	VersionPatch = 24        // Patch version component of the current release
+	VersionPatch = 25        // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )