diff --git a/search/ranker.cpp b/search/ranker.cpp
index 48bf18c6ca..f9ac808ab1 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -553,7 +553,7 @@ void Ranker::UpdateResults(bool lastUpdate)
       // For categorial requests, it is usual that several batches arrive
       // in the first call to UpdateResults(). Emit them as soon as they are available
       // to improve responsiveness.
-      if (count % m_params.m_batchSize == 0)
+      if (count != 0 && count % m_params.m_batchSize == 0)
         m_emitter.Emit();
     }