diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index b7a88ed57..40604a6c4 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -295,7 +295,11 @@ std::unique_ptr<Ui::Text::CustomEmoji> UiIntegration::createCustomEmoji(
 
 Fn<void()> UiIntegration::createSpoilerRepaint(const std::any &context) {
 	const auto my = std::any_cast<MarkedTextContext>(&context);
-	return my ? my->customEmojiRepaint : nullptr;
+	if (my) {
+		return my->customEmojiRepaint;
+	}
+	const auto common = std::any_cast<CommonTextContext>(&context);
+	return common ? common->repaint : nullptr;
 }
 
 rpl::producer<> UiIntegration::forcePopupMenuHideRequests() {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index da44ac82a..d54a4bb51 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit da44ac82a99ec05d7091eaaf6ae96a63bbae3714
+Subproject commit d54a4bb510a730d519f6085f81ca021c610402ee