diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
index 562a285f0fdcbce1910abd52929875e1c542fb06..2a801c97c3c8aadbede0b22053c8e715dd77c958 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
@@ -650,13 +650,13 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
         for (DatasetRecord record : records)
         {
             DataSetType dsType = dataSetTypes.get(record.dsty_id);
-            if (record.is_placeholder || record.location == null)
+            if (record.is_placeholder)
             {
                 // placeholder data sets are filtered out
             } else if (dsType.isContainerType())
             {
                 datasets.put(record.id, convertToContainerDataSet(record));
-            } else
+            } else if (record.location != null)
             {
                 datasets.put(record.id, convertToDataSet(record));
             }