diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/utils/EntityTypeLabelUtils.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/utils/EntityTypeLabelUtils.java
index 5779bbf3a54287e9cd7623a030d1839099076a0f..8fdfc44fd7e547766ee513131a6c8be7b18fd50d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/utils/EntityTypeLabelUtils.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/utils/EntityTypeLabelUtils.java
@@ -127,17 +127,17 @@ public class EntityTypeLabelUtils
         String label =
                 tryWithoutPrefix(datasetTypeCode,
                         ScreeningConstants.HCS_ANALYSIS_DATASET_TYPE_PREFIX);
-        if (label == null)
+        if (StringUtils.isBlank(label))
         {
             label =
                     tryWithoutPrefix(datasetTypeCode,
                             ScreeningConstants.HCS_IMAGE_DATASET_TYPE_PREFIX);
         }
-        if (label == null)
+        if (StringUtils.isBlank(label))
         {
             label = tryWithoutPrefix(datasetTypeCode, ScreeningConstants.HCS_DATASET_TYPE_PREFIX);
         }
-        if (label == null)
+        if (StringUtils.isBlank(label))
         {
             label = datasetTypeCode;
         }