diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index eb0488cb4..1868f8a67 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -540,6 +540,10 @@ MediaPhoto::MediaPhoto(
 , _photo(photo)
 , _spoiler(spoiler) {
 	parent->history()->owner().registerPhotoItem(_photo, parent);
+
+	if (_spoiler) {
+		Ui::PrepareImageSpoiler();
+	}
 }
 
 MediaPhoto::MediaPhoto(
@@ -753,6 +757,10 @@ MediaFile::MediaFile(
 			_emoji = emoji->text();
 		}
 	}
+
+	if (_spoiler) {
+		Ui::PrepareImageSpoiler();
+	}
 }
 
 MediaFile::~MediaFile() {