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 d53eb8230347ec4977a6c5ed77c3c39d5d93b99e..bd99a8e1c44c77a1ebdd653aad0c4a034beb53d8 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
@@ -1479,16 +1479,15 @@ public class ExportExecutor implements IExportExecutor
                 propertyAssignments.sort(Comparator.comparingInt(PropertyAssignment::getOrdinal));
 
                 final Map<String, Serializable> properties = includeSampleProperties((IPropertiesHolder) entityObj);
+                boolean firstAssignment = true;
                 String currentSection = null;
                 for (final PropertyAssignment propertyAssignment : propertyAssignments)
                 {
-                    if (!Objects.equals(propertyAssignment.getSection(), currentSection) || propertyAssignment.getOrdinal() == 1)
+                    if (!Objects.equals(propertyAssignment.getSection(), currentSection) || firstAssignment)
                     {
                         currentSection = propertyAssignment.getSection();
                         documentBuilder.addHeader(currentSection != null ? currentSection : "", 3);
-                    } else
-                    {
-                        System.out.printf("Skipping property assignment: %s. Current section: %s.%n", propertyAssignment, currentSection);
+                        firstAssignment = false;
                     }
 
                     final PropertyType propertyType = propertyAssignment.getPropertyType();