diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 467d5a59..3ee2a57b 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -221,10 +221,10 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
                                  false);
 
     if (!builder.isIgnored()) {
-        app->twitch.server->lastUserThatWhisperedMe.set(builder.userName);
-
         MessagePtr _message = builder.build();
 
+        app->twitch.server->lastUserThatWhisperedMe.set(builder.userName);
+
         if (_message->flags.has(MessageFlag::Highlighted)) {
             app->twitch.server->mentionsChannel->addMessage(_message);
         }