diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index a4ed8e449..10f12c9ee 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3676,7 +3676,8 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 
 	session->data().itemRemoved(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
-		return (_document != nullptr) && (item->fullId() == _msgid);
+		return (_document != nullptr || _photo != nullptr)
+			&& (item->fullId() == _msgid);
 	}) | rpl::start_with_next([=] {
 		close();
 	}, _sessionLifetime);