diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index f8d9f501f..bcefd5f16 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -72,7 +72,7 @@ void Channel::addMessage(MessagePtr message,
     }
 
     // FOURTF: change this when adding more providers
-    if (this->isTwitchChannel())
+    if (this->isTwitchChannel() && !overridingFlags->has(MessageFlag::Whisper))
     {
         app->logging->addMessage(this->name_, message);
     }
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index f4f4efa77..00b04b362 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -27,7 +27,7 @@ enum class MessageFlag : uint16_t {
     Untimeout = (1 << 10),
     PubSub = (1 << 11),
     Subscription = (1 << 12),
-    Notification = (1 << 13),
+    Whisper = (1 << 13),
     AutoMod = (1 << 14),
     RecentMessage = (1 << 15),
 };
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index a23ffa70d..759ff0ea3 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -261,6 +261,7 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
 
         auto overrideFlags = boost::optional<MessageFlags>(_message->flags);
         overrideFlags->set(MessageFlag::DoNotTriggerNotification);
+        overrideFlags->set(MessageFlag::Whisper);
 
         if (getSettings()->inlineWhispers)
         {