diff --git a/src/widgets/Scrollbar.cpp b/src/widgets/Scrollbar.cpp
index 879aa9af2..e412d9e25 100644
--- a/src/widgets/Scrollbar.cpp
+++ b/src/widgets/Scrollbar.cpp
@@ -55,6 +55,11 @@ void Scrollbar::unpauseHighlights()
     this->highlightsPaused_ = false;
 }
 
+void Scrollbar::clearHighlights()
+{
+    this->highlights_.clear();
+}
+
 LimitedQueueSnapshot<ScrollbarHighlight> Scrollbar::getHighlightSnapshot()
 {
     if (!this->highlightsPaused_) {
diff --git a/src/widgets/Scrollbar.hpp b/src/widgets/Scrollbar.hpp
index 114a1dfe6..09cbeb2c5 100644
--- a/src/widgets/Scrollbar.hpp
+++ b/src/widgets/Scrollbar.hpp
@@ -27,6 +27,7 @@ public:
 
     void pauseHighlights();
     void unpauseHighlights();
+    void clearHighlights();
 
     void scrollToBottom(bool animate = false);
     bool isAtBottom() const;
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 554d00bf2..d300e3e02 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -304,6 +304,7 @@ void ChannelView::clearMessages()
 {
     // Clear all stored messages in this chat widget
     this->messages.clear();
+    this->scrollBar_->clearHighlights();
 
     // Layout chat widget messages, and force an update regardless if there are
     // no messages