diff --git a/pom.xml b/pom.xml
index 8f4e610..e798e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>it.mgt.util</groupId>
     <artifactId>jpa-json-search</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearch.java b/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearch.java
index 9d6d8d0..6cd0bc7 100644
--- a/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearch.java
+++ b/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearch.java
@@ -220,7 +220,7 @@ private <V> TypedQuery<V> buildQuery(Class<V> type, boolean count) {
         for (Map.Entry<String, Object> e : jpqlAndParams.params.entrySet())
             query.setParameter(e.getKey(), e.getValue());
 
-        if (!count) {
+        if (!count & (page >= 0 && pageSize >= 0)) {
             query.setMaxResults(pageSize);
             query.setFirstResult(page * pageSize);
         }