diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33eb30a7..1ea26ae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unversioned
 
-- Minor: Add a separate highlight option for watchstreak notifications. (#6571)
+- Minor: Add a separate highlight option for watchstreak notifications. (#6571, #6581)
 - Minor: Badges now link to their home page like emotes in the context menu. (#6437)
 - Minor: Fixed usercard resizing improperly without recent messages. (#6496)
 - Minor: Added setting for character limit of deleted messages. (#6491)
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 27b2a326..b929f651 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -783,14 +783,7 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
                 parseTagString(messageText), tags,
                 calculateMessageTime(message).time(), channel);
 
-            if (msgType == "viewermilestone")
-            {
-                msg->flags.set(MessageFlag::WatchStreak);
-            }
-            else
-            {
-                msg->flags.set(MessageFlag::Subscription);
-            }
+            msg->flags.set(MessageFlag::Subscription);
 
             if (mirrored)
             {