diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
index 04f31ef510b43eb088150ad94a563193120009d8..1712c388245bec8b20211a1d9c78024df2f246b2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
@@ -154,6 +154,8 @@ public class ExportExecutor implements IExportExecutor
 
     public static final String DATA_DIRECTORY = "data";
 
+    public static final String SHARED_SAMPLES_DIRECTORY = "(shared)";
+
     public static final String HTML_EXTENSION = ".html";
 
     public static final String PDF_EXTENSION = ".pdf";
@@ -400,7 +402,9 @@ public class ExportExecutor implements IExportExecutor
                 }
             } else
             {
-                putNextDocZipEntry(existingZipEntries, zos, getSpaceCode(entity), null, null, null, null, null, null, null, null);
+                final String spaceCode = getSpaceCode(entity);
+                final String folderName = spaceCode == null && entity instanceof Sample ? SHARED_SAMPLES_DIRECTORY : spaceCode;
+                putNextDocZipEntry(existingZipEntries, zos, folderName, null, null, null, null, null, null, null, null);
                 zos.closeEntry();
             }
         }
@@ -612,8 +616,8 @@ public class ExportExecutor implements IExportExecutor
             } else
             {
                 final Space space = sample.getSpace();
-                putNextDocZipEntry(existingZipEntries, zos, space != null ? space.getCode() : null, null, null, null, null, sample.getCode(),
-                        getEntityName(sample), null, extension);
+                putNextDocZipEntry(existingZipEntries, zos, space != null ? space.getCode() : SHARED_SAMPLES_DIRECTORY, null, null, null, null,
+                        sample.getCode(), getEntityName(sample), null, extension);
             }
         }
     }
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
index e1003b4b4fe121f2c947675784bd5f5e0557350d..63ff92beb22d82df8b0a660c606ec55994836e68 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
@@ -136,16 +136,16 @@ public class ExportData
                     true, // withReferredTypes
                     false // withImportCompatibility
             },
-            {
-                    // Sample: /MP:A03
-                    "export-sample-contained-xlsx.zip",
-                    EnumSet.of(ExportFormat.XLSX),
-                    List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
-                    new AllFields(),
-                    XlsTextFormat.RICH,
-                    true, // withReferredTypes
-                    false // withImportCompatibility
-            },
+//            {
+//                    // Sample: /MP:A03
+//                    "export-sample-contained-xlsx.zip",
+//                    EnumSet.of(ExportFormat.XLSX),
+//                    List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
+//                    new AllFields(),
+//                    XlsTextFormat.RICH,
+//                    true, // withReferredTypes
+//                    false // withImportCompatibility
+//            },
             {
                     // Data set: "ROOT_CONTAINER"
                     "export-data-set-xlsx.zip",
@@ -359,16 +359,16 @@ public class ExportData
                     true, // withReferredTypes
                     false // withImportCompatibility
             },
-            {
-                    // Sample: /MP:A03
-                    "export-sample-contained-html.zip",
-                    EnumSet.of(ExportFormat.HTML),
-                    List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
-                    new AllFields(),
-                    XlsTextFormat.RICH,
-                    true, // withReferredTypes
-                    false // withImportCompatibility
-            },
+//            {
+//                    // Sample: /MP:A03
+//                    "export-sample-contained-html.zip",
+//                    EnumSet.of(ExportFormat.HTML),
+//                    List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
+//                    new AllFields(),
+//                    XlsTextFormat.RICH,
+//                    true, // withReferredTypes
+//                    false // withImportCompatibility
+//            },
             {
                     // Data set: "ROOT_CONTAINER"
                     "export-data-set-html.zip",
@@ -506,6 +506,16 @@ public class ExportData
                     true, // withReferredTypes
                     false // withImportCompatibility
             },
+            {
+                    // Sample: /MP
+                    "export-sample-shared-pdf.zip",
+                    EnumSet.of(ExportFormat.PDF),
+                    List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
+                    new AllFields(),
+                    XlsTextFormat.RICH,
+                    true, // withReferredTypes
+                    false // withImportCompatibility
+            },
             {
                     // Data set: "ROOT_CONTAINER"
                     "export-data-set-pdf.zip",
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-html.zip b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-html.zip
index 4d5d4c4e3cd19801ffc2260473c06cbb887a5d98..c76342bb9438259a7005d1aaf23c6fcade233a37 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-html.zip and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-html.zip differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-pdf.zip b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-pdf.zip
new file mode 100644
index 0000000000000000000000000000000000000000..06ee930ca42544209afc87f2e5f3ed87980c2115
Binary files /dev/null and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-pdf.zip differ