diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index bf69515f29..d4d381c2a5 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2330,9 +2330,12 @@ void HistoryWidget::showHistory(
 	updateOverStates(mapFromGlobal(QCursor::pos()));
 
 	if (_history) {
+		const auto msgId = (_showAtMsgId == ShowAtTheEndMsgId)
+			? ShowAtUnreadMsgId
+			: _showAtMsgId;
 		controller()->setActiveChatEntry({
 			_history,
-			FullMsgId(_history->peer->id, _showAtMsgId) });
+			FullMsgId(_history->peer->id, msgId) });
 	}
 	update();
 	controller()->floatPlayerAreaUpdated();