diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java
index 09f410524bb238867cd2de4799138923919c7792..54f661b6076024031c67cfff1fa80863f9cf6d34 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java
@@ -508,7 +508,7 @@ public class ScreeningOpenbisServiceFacade implements IScreeningOpenbisServiceFa
                         : dataSetMetadataOrNull;
         final DataSetOwner dataSetOwner =
                 new DataSetOwner(DataSetOwnerType.SAMPLE, sample.getIdentifier());
-        final String dataSetFolderNameOrNull = null;
+        final String dataSetFolderNameOrNull = dataSetFile.isDirectory() ? dataSetFile.getName() : null;
         final List<FileInfoDssDTO> fileInfos = getFileInfosForPath(dataSetFile);
         final NewDataSetDTO newDataSet =
                 new NewDataSetDTO(dataSetMetadata, dataSetOwner, dataSetFolderNameOrNull, fileInfos);