diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 4d6c90eeb..477a04604 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5239,6 +5239,9 @@ void HistoryWidget::replyToNextMessage() {
 				const auto next = nextView->data();
 				Ui::showPeerHistoryAtItem(next);
 				replyToMessage(next);
+			} else {
+				clearHighlightMessages();
+				cancelReply(false);
 			}
 		}
 	}