diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index ca14d384b..251b64af2 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -568,6 +568,12 @@ void NotebookTab::updateHighlightState(HighlightState newHighlightStyle,
         return;
     }
 
+    if (!this->highlightEnabled_ &&
+        newHighlightStyle == HighlightState::NewMessage)
+    {
+        return;
+    }
+
     // message is highlighting unvisible tab
 
     auto underlyingChannel = channelViewSource.underlyingChannel();
@@ -603,12 +609,6 @@ void NotebookTab::updateHighlightState(HighlightState newHighlightStyle,
             break;
     }
 
-    if (!this->highlightEnabled_ &&
-        newHighlightStyle == HighlightState::NewMessage)
-    {
-        return;
-    }
-
     if (this->highlightState_ == newHighlightStyle ||
         this->highlightState_ == HighlightState::Highlighted)
     {