diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 002152c5b3..d268d4b3f9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -499,12 +499,13 @@ TextWithEntities ThemeDocumentBox::subtitle() {
 }
 
 rpl::producer<QString> ThemeDocumentBox::button() {
-	return _parent->data()->out()
-		? nullptr
-		: rpl::conditional(
-			WallPaperRevertableValue(_parent->data()),
-			tr::lng_action_set_wallpaper_remove(),
-			tr::lng_action_set_wallpaper_button());
+	if (_parent->data()->out()) {
+		return {};
+	}
+	return rpl::conditional(
+		WallPaperRevertableValue(_parent->data()),
+		tr::lng_action_set_wallpaper_remove(),
+		tr::lng_action_set_wallpaper_button());
 }
 
 ClickHandlerPtr ThemeDocumentBox::createViewLink() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
index fef5f44847..a8b3b2c0de 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
@@ -92,7 +92,7 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 			} else if (type == QEvent::MouseButtonRelease) {
 				if (const auto activated = ClickHandler::unpressed()) {
 					ActivateClickHandler(_wrap.get(), activated, {
-						mouse()->button(),
+						mouse()->button(), QVariant(),
 					});
 				}
 			}