diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java
index 47ceba6598..d070c35ce1 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java
@@ -470,7 +470,7 @@ public class EthPeers implements PeerSelector {
   // Part of the PeerSelector interface, to be split apart later
   @Override
   public Optional<EthPeer> getPeer(final Predicate<EthPeer> filter) {
-    return bestPeerMatchingCriteria(filter);
+    return streamBestPeers().filter(filter).filter(EthPeer::hasAvailableRequestCapacity).findFirst();
   }
 
   // Part of the PeerSelector interface, to be split apart later