diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
index ec60ba102b137e5fe587ff9a0bddf0f103eb98c0..b9527fce6302859cf7f88416e9d46fcffb2e4d31 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
@@ -196,8 +196,9 @@ final class EntityPropertyTypeDAO extends AbstractDAO implements IEntityProperty
         String query =
                 String
                         .format(
-                                "SELECT s.id FROM %s s WHERE s.sampleType = ? AND s not in (SELECT sp.entity FROM %s sp WHERE sp.entityTypePropertyType = ?)",
+                                "SELECT e.id FROM %s e WHERE e.%s = ? AND e not in (SELECT p.entity FROM %s p WHERE p.entityTypePropertyType = ?)",
                                 entityKind.getEntityClass().getSimpleName(), entityKind
+                                        .getEntityTypeFieldName(), entityKind
                                         .getEntityPropertyClass().getSimpleName());
         final List<Long> list =
                 cast(getHibernateTemplate().find(query,