diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java
index cfcf402418bfead72d38c8cf4cc251f44519f1ae..a803f7945888f7563954311e1f06d8ebc35dcf95 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java
@@ -52,10 +52,11 @@ public final class SampleModelFactory
                 parentColumnsSchema);
     }
 
-    public static BaseEntityModel<Sample> createModel(GridRowModel<Sample> sampleModel)
+    public static BaseEntityModel<Sample> createModel(GridRowModel<Sample> sampleModel,
+            SampleType sampleType)
     {
         List<? extends IColumnDefinitionUI<Sample>> allColumnsDefinition =
-                new SampleModelFactory().createColumnsSchemaForRendering(sampleModel);
+                new SampleModelFactory().createColumnsSchemaForRendering(sampleModel, sampleType);
         BaseEntityModel<Sample> model =
                 new BaseEntityModel<Sample>(sampleModel, allColumnsDefinition);
         return model;
@@ -70,12 +71,12 @@ public final class SampleModelFactory
     }
 
     private List<IColumnDefinitionUI<Sample>> createColumnsSchemaForRendering(
-            GridRowModel<Sample> sampleModel)
+            GridRowModel<Sample> sampleModel, SampleType sampleType)
     {
         List<IColumnDefinitionUI<Sample>> columns =
                 entityGridModelFactory.createColumnsSchemaForRendering(sampleModel);
         List<AbstractParentSampleColDef> parentColumns =
-                createParentColumnsSchema(null, sampleModel.getOriginalObject().getSampleType());
+                createParentColumnsSchema(null, sampleType);
         columns.addAll(parentColumns);
         return columns;
     }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index abc62ef45137dac84a6fd75f324a8d922ca20771..6df5bc7071ea112e105631f8789b74004de0cf1a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
@@ -443,7 +443,7 @@ public class SampleBrowserGrid extends
     @Override
     protected BaseEntityModel<Sample> createModel(GridRowModel<Sample> entity)
     {
-        return SampleModelFactory.createModel(entity);
+        return SampleModelFactory.createModel(entity, criteria.tryGetSampleType());
     }
 
     @Override