diff --git a/p2p/discover/lookup.go b/p2p/discover/lookup.go
index 91d4d7a919..c2b39a8c2b 100644
--- a/p2p/discover/lookup.go
+++ b/p2p/discover/lookup.go
@@ -78,7 +78,8 @@ func (it *lookup) advance() bool {
 		select {
 		case nodes := <-it.replyCh:
 			it.queries--
-			if it.addNodes(nodes) {
+			it.addNodes(nodes)
+			if !it.empty() {
 				return true
 			}
 		case <-it.cancelCh:
@@ -88,7 +89,7 @@ func (it *lookup) advance() bool {
 	return false
 }
 
-func (it *lookup) addNodes(nodes []*enode.Node) (done bool) {
+func (it *lookup) addNodes(nodes []*enode.Node) {
 	it.replyBuffer = it.replyBuffer[:0]
 	for _, n := range nodes {
 		if n != nil && !it.seen[n.ID()] {
@@ -97,7 +98,6 @@ func (it *lookup) addNodes(nodes []*enode.Node) (done bool) {
 			it.replyBuffer = append(it.replyBuffer, n)
 		}
 	}
-	return len(it.replyBuffer) == 0
 }
 
 func (it *lookup) shutdown() {