diff --git a/KfChatDotNetBot/ChatBot.cs b/KfChatDotNetBot/ChatBot.cs
index b6ab58f..32e5681 100644
--- a/KfChatDotNetBot/ChatBot.cs
+++ b/KfChatDotNetBot/ChatBot.cs
@@ -283,7 +283,8 @@ public class ChatBot
         }
 
         var sentMsgMaybe = SentMessages.FirstOrDefault(msg =>
-            msg.Type == SentMessageType.Whisper && msg.WhisperMessage == whisper.MessageRawHtmlDecoded);
+            msg.Type == SentMessageType.Whisper && msg.WhisperMessage == whisper.MessageRawHtmlDecoded &&
+            msg.Status == SentMessageTrackerStatus.WaitingForResponse);
         sentMsgMaybe?.Status = SentMessageTrackerStatus.ResponseReceived;
         _logger.Debug("Passing message to command interface");
         var botCommandsMsg = new BotCommandMessageModel