diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
index 6954a7c2c1e3a5edfba60edb60b38100a68978cc..3d300189de02eb496b84f57499977a57aeef9b85 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
@@ -112,7 +112,7 @@ final class DataDAO extends AbstractGenericEntityWithPropertiesDAO<DataPE> imple
     @Override
     public boolean hasDataSet(SamplePE sample) throws DataAccessException
     {
-        final DetachedCriteria criteria = DetachedCriteria.forClass(ExternalDataPE.class);
+        final DetachedCriteria criteria = DetachedCriteria.forClass(DataPE.class);
         criteria.add(Restrictions.eq("sampleInternal", sample));
         criteria.setProjection(Projections.rowCount());
         Integer count =