diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 39bf065158..9091d2cae1 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -363,9 +363,8 @@ void start() {
 		_readOldMtpData(false, context); // needed further in _readMtpData
 		applyReadContext(std::move(context));
 
-		if (!ApplyDefaultNightMode()) {
-			writeSettings();
-		}
+		_settingsRewriteNeeded = true;
+		ApplyDefaultNightMode();
 		return;
 	}
 	LOG(("App Info: reading settings..."));
@@ -1072,6 +1071,7 @@ bool ApplyDefaultNightMode() {
 		|| _themeKeyLegacy) {
 		return false;
 	}
+	Core::App().startSettingsAndBackground();
 	Window::Theme::ToggleNightMode();
 	Window::Theme::KeepApplied();
 	return true;