diff --git a/netsync/manager.go b/netsync/manager.go
index fd6a3ad36..806bc51fa 100644
--- a/netsync/manager.go
+++ b/netsync/manager.go
@@ -1042,7 +1042,7 @@ func (sm *SyncManager) addInvsToGetDataMessageFromQueue(gdmsg *wire.MsgGetData,
 	}
 	invsToAdd := make([]*wire.InvVect, 0, invsNum)
 
-	for len(requestQueue) != 0 {
+	for len(requestQueue) != 0 && len(invsToAdd) < invsNum {
 		iv := requestQueue[0]
 		requestQueue[0] = nil
 		requestQueue = requestQueue[1:]