diff --git a/pkg/network/server.go b/pkg/network/server.go
index e6d142d11..6b043544a 100644
--- a/pkg/network/server.go
+++ b/pkg/network/server.go
@@ -499,7 +499,7 @@ func (s *Server) run() {
 			s.discovery.RequestRemote(min(s.AttemptConnPeers, optimalN-peerN))
 		}
 
-		if addrCheckTimeout || s.discovery.PoolCount() < s.AttemptConnPeers {
+		if addrCheckTimeout || s.discovery.PoolCount()+peerN < s.AttemptConnPeers {
 			s.broadcastHPMessage(NewMessage(CMDGetAddr, payload.NewNullPayload()))
 			addrCheckTimeout = false
 		}