diff --git a/private/tooltip.cpp b/private/tooltip.cpp
index 3be6d7a88..bd1a3a3fe 100644
--- a/private/tooltip.cpp
+++ b/private/tooltip.cpp
@@ -304,7 +304,12 @@ void ToolTip::setContent(QObject *tipper, const ToolTipContent &data)
 {
     //reset our size
     d->text->setContent(data);
-    d->imageLabel->setPixmap(data.image());
+    if (data.image().isNull()) {
+        d->imageLabel->hide();
+    } else {
+        d->imageLabel->show();
+        d->imageLabel->setPixmap(data.image());
+    }
 
     if (data.highlightWindows() && !data.windowsToPreview().isEmpty()) {
         WindowEffects::highlightWindows(winId(), QList<WId>() << winId() << data.windowsToPreview());