diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 1183ff327..9751a2756 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -380,7 +380,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
      */
     public function hasLimit()
     {
-        return $this->limitCount !== null;
+        return $this->limitCount !== null && $this->limitCount > 0;
     }
 
     /**