diff --git a/pom.xml b/pom.xml
index 8f4e610..e798e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
it.mgt.util
jpa-json-search
- 1.2.4
+ 1.2.5
UTF-8
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 TypedQuery buildQuery(Class type, boolean count) {
for (Map.Entry 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);
}