diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 98f4621f30..9255638a73 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1572,7 +1572,6 @@ rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved(
 }
 
 void Session::notifyViewRemoved(not_null<const ViewElement*> view) {
-	_shownSpoilers.remove(view);
 	_viewRemoved.fire_copy(view);
 }
 
@@ -3707,6 +3706,8 @@ void Session::registerItemView(not_null<ViewElement*> view) {
 void Session::unregisterItemView(not_null<ViewElement*> view) {
 	Expects(!_heavyViewParts.contains(view));
 
+	_shownSpoilers.remove(view);
+
 	const auto i = _views.find(view->data());
 	if (i != end(_views)) {
 		auto &list = i->second;