diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
index 4be327730930971304a16a20ab05ab3d2f99f395..91e87474e7723169da7067366fcbf71bdceebbb3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
@@ -175,7 +175,7 @@ public abstract class AbstractCompositeEntitySearchManager<CRITERIA extends Abst
                             ? Collections.singleton(containerCriteriaIntermediateResults) : Collections.emptySet(),
                     nestedCriteriaIntermediateResults);
         } else if (mainCriteria.isEmpty() && parentRelationshipsCriteria.isEmpty()
-                && childRelationshipsCriteria.isEmpty() && nestedCriteria.isEmpty())
+                && childRelationshipsCriteria.isEmpty() && nestedCriteria.isEmpty() && containerCriteria.isEmpty())
         {
             // If we don't have results and criteria are empty, return all.
             results = getAllIds(userId, authorisationInformation, idsColumnName, tableMapper, null);