diff --git a/src/twitch/twitchmessagebuilder.cpp b/src/twitch/twitchmessagebuilder.cpp
index f7f56361b..21367b2aa 100644
--- a/src/twitch/twitchmessagebuilder.cpp
+++ b/src/twitch/twitchmessagebuilder.cpp
@@ -163,6 +163,8 @@ MessagePtr TwitchMessageBuilder::parse()
 
                 Link link;
 
+                qDebug() << linkString;
+
                 if (linkString.isEmpty()) {
                     link = Link();
                 } else {
diff --git a/src/widgets/helper/channelview.cpp b/src/widgets/helper/channelview.cpp
index d02b285b0..6010c3fe8 100644
--- a/src/widgets/helper/channelview.cpp
+++ b/src/widgets/helper/channelview.cpp
@@ -632,9 +632,13 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     }
     const auto &tooltip = hoverLayoutElement->getCreator().getTooltip();
 
-    tooltipWidget->moveTo(event->globalPos());
-    tooltipWidget->setText(tooltip);
-    tooltipWidget->show();
+    if (tooltip.isEmpty()) {
+        tooltipWidget->hide();
+    } else {
+        tooltipWidget->moveTo(event->globalPos());
+        tooltipWidget->setText(tooltip);
+        tooltipWidget->show();
+    }
 
     // check if word has a link
     if (hoverLayoutElement->getCreator().getLink().isValid()) {