diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 0f428913a..f68eed90e 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -55,7 +55,8 @@ MTPInputReplyTo ReplyToForMTP(
 				? replyingToTopic->rootId()
 				: Data::ForumTopic::kGeneralId)
 			: (to ? to->topicRootId() : Data::ForumTopic::kGeneralId);
-		const auto replyToTopicId = to
+		const auto replyToTopicId = (to
+			&& (to->history() != history || to->id != replyingToTopicId))
 			? to->topicRootId()
 			: replyingToTopicId;
 		const auto external = replyTo.messageId