diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SamplePropertyTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SamplePropertyTranslator.java
index 4eb25a68a7bae7a6ecb0f7d251d534dd2f54f169..3ba49b70a3843872d280338a1cc7f63b7f203d25 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SamplePropertyTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SamplePropertyTranslator.java
@@ -39,8 +39,7 @@ public final class SamplePropertyTranslator
     public final static SampleProperty translate(final SamplePropertyPE samplePropertyPE)
     {
         final SampleProperty result = new SampleProperty();
-        result.setValue(samplePropertyPE.getValue() == null ? samplePropertyPE.getVocabularyTerm()
-                .getCode() : samplePropertyPE.getValue());
+        result.setValue(samplePropertyPE.tryGetUntypedValue());
         result
                 .setEntityTypePropertyType(SampleTypePropertyTypeTranslator
                         .translate((SampleTypePropertyTypePE) samplePropertyPE