diff --git a/query_executor.go b/query_executor.go
index f154c66f8..4a5d875c1 100644
--- a/query_executor.go
+++ b/query_executor.go
@@ -152,6 +152,10 @@ func (q *queryExecutor) run(qry ExecutableQuery, specWG *sync.WaitGroup, results
 			case RetryNextHost:
 				// retry on the next host
 				selectedHost = hostIter()
+				if selectedHost == nil {
+					results <- queryResponse{iter: iter}
+					return
+				}
 				continue
 			default:
 				// Undefined? Return nil and error, this will panic in the requester