diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index cdd19e22df..35e05484fa 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -4747,8 +4747,12 @@ void HistoryWidget::notify_historyItemLayoutChanged(const HistoryItem *item) {
 
 void HistoryWidget::notify_handlePendingHistoryUpdate() {
 	if (hasPendingResizedItems() || _updateHistoryGeometryRequired) {
-		updateHistoryGeometry();
-		_list->update();
+		if (_list) {
+			updateHistoryGeometry();
+			_list->update();
+		} else {
+			_updateHistoryGeometryRequired = false;
+		}
 	}
 }