diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
index bae74ef8bf..4f2d8961c2 100644
--- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
+++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
@@ -78,15 +78,13 @@ void SetupGhostModeToggle(not_null<Ui::VerticalLayout*> container) {
 	AddCollapsibleToggle(container, tr::ayu_GhostModeToggle(), checkboxes, true);
 }
 
-void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
-	auto *settings = &AyuSettings::getInstance();
-
+void SetupGhostEssentials(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<AyuSettings::AyuGramSettings*> settings,
+	not_null<rpl::variable<bool>*> markReadAfterActionVal,
+	not_null<rpl::variable<bool>*> useScheduledMessagesVal) {
 	SetupGhostModeToggle(container);
 
-	auto markReadAfterActionVal = container->lifetime().make_state<rpl::variable<bool>>(
-		settings->markReadAfterAction);
-	auto useScheduledMessagesVal = container->lifetime().make_state<rpl::variable<
-		bool>>(settings->useScheduledMessages);
 
 	AddButtonWithIcon(
 		container,
@@ -115,14 +113,11 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
 	AddDividerText(container, tr::ayu_MarkReadAfterActionDescription());
 }
 
-void SetupScheduleMessages(not_null<Ui::VerticalLayout*> container) {
-	auto *settings = &AyuSettings::getInstance();
-
-	auto markReadAfterActionVal = container->lifetime().make_state<rpl::variable<bool>>(
-		settings->markReadAfterAction);
-	auto useScheduledMessagesVal = container->lifetime().make_state<rpl::variable<
-		bool>>(settings->useScheduledMessages);
-
+void SetupScheduleMessages(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<AyuSettings::AyuGramSettings*> settings,
+	not_null<rpl::variable<bool>*> markReadAfterActionVal,
+	not_null<rpl::variable<bool>*> useScheduledMessagesVal) {
 	AddSkip(container);
 	AddButtonWithIcon(
 		container,
@@ -290,11 +285,17 @@ void SetupOther(not_null<Ui::VerticalLayout*> container) {
 
 void AyuGhost::setupContent(not_null<Window::SessionController*> controller) {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	auto settings = &AyuSettings::getInstance();
+
+	auto markReadAfterActionVal = content->lifetime().make_state<rpl::variable<bool>>(
+		settings->markReadAfterAction);
+	auto useScheduledMessagesVal = content->lifetime().make_state<rpl::variable<bool>>(
+		settings->useScheduledMessages);
 
 	AddSkip(content);
 
-	SetupGhostEssentials(content);
-	SetupScheduleMessages(content);
+	SetupGhostEssentials(content, settings, markReadAfterActionVal, useScheduledMessagesVal);
+	SetupScheduleMessages(content, settings, markReadAfterActionVal, useScheduledMessagesVal);
 	SetupSendWithoutSound(content);
 
 	AddSkip(content);