diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/PlateLayouter.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/PlateLayouter.java
index f1ab8392db22bc60afc4ba0c112a3603c34d0c19..e6168f7acaa76650df867dddeef4f65d137d050e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/PlateLayouter.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/PlateLayouter.java
@@ -126,7 +126,13 @@ public class PlateLayouter
                 {
                     Component wellComponent = renderedWells[rowIx][colIx];
                     PlateStyleSetter.setBackgroudColor(wellComponent, color.getHexColor());
-                    GWTUtils.setToolTip(wellComponent, tooltipOrNull);
+                    if (tooltipOrNull != null)
+                    {
+                        GWTUtils.setToolTip(wellComponent, tooltipOrNull);
+                    } else
+                    {
+                        wellComponent.removeToolTip();
+                    }
                 }
 
                 public void updateLegend(Widget legend)