diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 2d6e3fbd9..f267ba0b3 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -2089,8 +2089,9 @@ void History::setLastMessage(HistoryItem *item) {
 	if (_lastMessage) {
 		if (*_lastMessage == item) {
 			return;
-		} else if (!IsServerMsgId((*_lastMessage)->id)
-				&& (*_lastMessage)->date() > item->date()) {
+		} else if (*_lastMessage
+			&& !IsServerMsgId((*_lastMessage)->id)
+			&& (*_lastMessage)->date() > item->date()) {
 			return;
 		}
 	}