diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/dataaccess/IScreeningQuery.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/dataaccess/IScreeningQuery.java
index added4d60cb6d2f3fdf9b409077e58db1d3ee466..2553883d18088e0946bac24633186af97780c8e0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/dataaccess/IScreeningQuery.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/dataaccess/IScreeningQuery.java
@@ -320,7 +320,8 @@ public interface IScreeningQuery extends BaseQuery
             + "             from samples wells "
             + "                     join samples plates on wells.samp_id_part_of = plates.id "
             + "             where plates.expe_id = exp.id) ";
-    @Select(sql = ANALYSIS_PROCEDURE_SELECT)
+
+    @Select(sql = ANALYSIS_PROCEDURE_SELECT + " and " + AT_LEAST_ONE_WELL_EXISTS)
     public List<AnalysisProcedureResult> listAllAnalysisProcedures();
 
     @Select(sql = ANALYSIS_PROCEDURE_SELECT + " and exp.id = ?{1} and " + AT_LEAST_ONE_WELL_EXISTS)