diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
index 5c0dd088dbfcf3f3683081eff39e774d3bfd9d28..0fc6ce7eb9128f72d6c1a88f5390acb84e0a5f9d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
@@ -494,6 +494,7 @@ final class SampleListingWorker
     {
         final Sample sample = new Sample();
         sample.setId(row.id);
+        sample.setPermId(StringEscapeUtils.escapeHtml(row.perm_id));
         sample.setCode(IdentifierHelper.convertCode(row.code, null));
         sample.setSubCode(IdentifierHelper.convertSubCode(row.code));
         sample.setSampleType(sampleTypes.get(row.saty_id));
@@ -526,7 +527,6 @@ final class SampleListingWorker
         {
             // initializing property collection - without this enricher will not work properly
             sample.setProperties(new ArrayList<IEntityProperty>());
-            sample.setPermId(StringEscapeUtils.escapeHtml(row.perm_id));
             sample.setPermlink(PermlinkUtilities.createPermlinkURL(baseIndexURL, EntityKind.SAMPLE,
                     row.perm_id));
             sample.setSearchlink(SearchlinkUtilities.createSearchlinkURL(baseIndexURL,