diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index fab66f5f4..1b7c63298 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -2191,13 +2191,11 @@ void History::setChatListMessage(HistoryItem *item) {
 		return;
 	}
 	if (item) {
-		if (_chatListMessage) {
-			if (!*_chatListMessage) {
-				Local::removeSavedPeer(peer);
-			} else if (!IsServerMsgId((*_chatListMessage)->id)
-				&& (*_chatListMessage)->date() > item->date()) {
-				return;
-			}
+		if (!_chatListMessage || !*_chatListMessage) {
+			Local::removeSavedPeer(peer);
+		} else if (!IsServerMsgId((*_chatListMessage)->id)
+			&& (*_chatListMessage)->date() > item->date()) {
+			return;
 		}
 		_chatListMessage = item;
 		setChatListTimeId(item->date());