diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
index 3e2f45aa7..7edb1a78e 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
@@ -351,7 +351,7 @@ bool FieldHeader::isEditingMessage() const {
 }
 
 bool FieldHeader::hasPreview() const {
-	return _preview.data != nullptr;
+	return ShowWebPagePreview(_preview.data);
 }
 
 WebPageId FieldHeader::webPageId() const {
@@ -1013,6 +1013,13 @@ void ComposeControls::initWebpageProcess() {
 		requestRepaint
 	), lifetime);
 
+	_window->session().data().webPageUpdates(
+	) | rpl::filter([=](not_null<WebPageData*> page) {
+		return (*previewData == page.get());
+	}) | rpl::start_with_next([=] {
+		updatePreview();
+	}, lifetime);
+
 	const auto fieldLinksParser =
 		lifetime.make_state<MessageLinksParser>(_field);