diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
index 4d2a9cc90..6e18b0f88 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
@@ -119,7 +119,7 @@ public class DmpRepository extends ElasticRepository<Dmp, DmpCriteria> {
 
 			}
 			searchSourceBuilder.query(boolQuery).from(criteria.getOffset()).fetchSource("id", null);
-			if (criteria.getSize() > 0) {
+			if (criteria.getSize() != null && criteria.getSize() > 0) {
 				searchSourceBuilder.size(criteria.getSize());
 			}
 			sortBuilders.forEach(searchSourceBuilder::sort);