diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 0b222c245..11504e996 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1270,6 +1270,9 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
 }
 
 void History::registerLocalMessage(not_null<HistoryItem*> item) {
+	Expects(item->isHistoryEntry());
+	Expects(IsClientMsgId(item->id));
+
 	_localMessages.emplace(item);
 	if (peer->isChannel()) {
 		Notify::peerUpdatedDelayed(
@@ -1279,7 +1282,9 @@ void History::registerLocalMessage(not_null<HistoryItem*> item) {
 }
 
 void History::unregisterLocalMessage(not_null<HistoryItem*> item) {
-	_localMessages.remove(item);
+	const auto removed = _localMessages.remove(item);
+	Assert(removed);
+
 	if (peer->isChannel()) {
 		Notify::peerUpdatedDelayed(
 			peer,
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 898cf6394..69b842b32 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -178,7 +178,7 @@ HistoryItem::HistoryItem(
 , _flags(flags)
 , _clientFlags(clientFlags)
 , _date(date) {
-	if (IsClientMsgId(id)) {
+	if (isHistoryEntry() && IsClientMsgId(id)) {
 		_history->registerLocalMessage(this);
 	}
 }