diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java
index 0e74b76fadf45ae4b7669b77b26288051e1840c2..f0f078349930c6e4519be04d042cfbc0adc31134 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java
@@ -6,6 +6,7 @@ import com.extjs.gxt.ui.client.widget.grid.Grid;
 import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.MultilineHTML;
 
 public class InternalLinkCellRenderer implements GridCellRenderer<BaseEntityModel<?>>
 {
@@ -34,7 +35,7 @@ public class InternalLinkCellRenderer implements GridCellRenderer<BaseEntityMode
             String tokenOrNull = model.tryGetLink(property);
             if (tokenOrNull == null && renderOriginalValueForEmptyToken)
             {
-                return originalValue;
+                return new MultilineHTML(originalValue).toString();
             } else
             {
                 String href = "#" + (tokenOrNull != null ? tokenOrNull : "");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java
index c1de7882d3ea2ffc233a97f9b91bb565cd47a275..549ca83249d864f6403b29ed6f881865cc05d469 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java
@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.sample;
 
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.MultilineHTML;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
 
 public class ParentGeneratedFromSampleColDef extends AbstractParentSampleColDef
@@ -77,7 +76,7 @@ public class ParentGeneratedFromSampleColDef extends AbstractParentSampleColDef
                 sb.append(getAsValue(parent)).append("\n");
                 counter++;
             }
-            return new MultilineHTML(sb.toString()).toString();
+            return sb.toString();
         }
     }