diff --git a/server/matchmaker_process.go b/server/matchmaker_process.go
index bf9d2472bce85950ec4839429815f80254ecd4db..c04e9e77e49177b820685c3503b7444659986257 100644
--- a/server/matchmaker_process.go
+++ b/server/matchmaker_process.go
@@ -471,8 +471,8 @@ func (m *LocalMatchmaker) processCustom() [][]*MatchmakerEntry {
 			continue
 		}
 
-		// Reset if last step.
-		if searchStep > maxSearchSteps {
+		// Reset if last step or no more results.
+		if searchStep > maxSearchSteps || len(blugeMatches.Hits) == 0 {
 			searchStartIndex = 0
 			searchStep = 1
 		} else if len(blugeMatches.Hits) > 0 {