diff --git a/src/Search/Comb/Comb.php b/src/Search/Comb/Comb.php
index 09526c7cc9..28f6b238f6 100644
--- a/src/Search/Comb/Comb.php
+++ b/src/Search/Comb/Comb.php
@@ -834,7 +834,7 @@ private function testValidQuery($query)
     {
         $length = strlen($query);
 
-        if ($length === 0) {
+        if ($length === 0 && $this->min_characters > 0) {
             throw new NoQuery('No query given.');
         }