diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java
index 64bb76c..42b336a 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java
@@ -215,7 +215,7 @@ public class AccountingPersistenceQueryPostgreSQL implements AccountingPersisten
 				orderingProperty = AccountingPersistenceQuery.getDefaultOrderingProperties(clz);
 			}
 			
-			if(limit == null || limit<1 || limit >50) {
+			if(limit<1 || limit >50) {
 				limit = MAX_TOP_LIMIT;
 			}
 			
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
index 2c1a863..557ce5b 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
@@ -317,11 +317,9 @@ public class Query extends PostgreSQLQuery {
 	}
 	
 	protected void addLimit() {
-		stringBuffer.append(" LIMIT ");
 		if(limit != null) {
+			stringBuffer.append(" LIMIT ");
 			stringBuffer.append(limit.toString());
-		}else {
-			stringBuffer.append(50);
 		}
 	}