diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
index de66140b3e7819c35daeb0e6bff7257b3c6252fc..6e479a48915d8664c844aa1ea528ca389910f554 100644
--- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
+++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
@@ -24,6 +24,7 @@ public class DownloadFileTest extends AbstractFileTest
     {
         IDataSetFileId root = new DataSetFilePermId(new DataSetPermId(dataSetCode));
         DataSetFileDownloadOptions options = new DataSetFileDownloadOptions();
+        options.setRecursive(true);
 
         Map<String, String> contentMap = download(Arrays.asList(root), options);
 
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java
index fdf83043a6c12734f5c54ab64302b20cee1b09b8..54e87a8cf96474d1021b6319698b6060a80e1abd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java
@@ -26,7 +26,7 @@ public class DataSetFileDownloadOptions implements Serializable
 
     private static final long serialVersionUID = 1L;
 
-    private boolean recursive = true;
+    private boolean recursive = false;
 
     public boolean isRecursive()
     {