diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
index ef634dd85..4240840f4 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
@@ -31,7 +31,7 @@ public class OrganisationDaoImpl extends DatabaseAccess<Organisation> implements
         if (criteria.getLabelLike() != null) {
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLabelLike().toUpperCase() + "%"));
         }
-        if (criteria.getPublic()) {
+        if (criteria.getPublic() != null && criteria.getPublic()) {
             query.where((builder, root) -> builder.equal(root.join("dmps", JoinType.LEFT).get("status"), DMP.DMPStatus.FINALISED.getValue()));
         }
         return query;