diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java
index 41338fd41c4aa8a17ee87634de16df58c62cb85d..4a56256c45a39773b5245dc7a8786980c89aa9b6 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java
@@ -73,7 +73,8 @@ public class CodeAndLabel
             }
         }
         code = normalize(c);
-        label = t.trim();
+        String rest = t.trim();
+        label = rest.length() == 0 ? code : rest;
     }
 
     /**
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
index 68de4be9e49ed243c8cc89c2953a85717d1c50b9..ca06d9feefbdb07f9cff976b8086cdc06a5abe52 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
@@ -44,6 +44,7 @@ public class CodeAndLabelTest extends AssertJUnit
     {
         assertCodeAndTitle("ABC_1_2_3_4", "abc", new CodeAndLabel("<abc?1=2-3+4> abc"));
         assertCodeAndTitle("ABC_123_", "abc<123>", new CodeAndLabel("abc<123>"));
+        assertCodeAndTitle("ABC", "ABC", new CodeAndLabel("<abc> "));
     }
 
     private void assertCodeAndTitle(String expectedCode, String expectedTitle,