diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 136ff0943..3e90709d8 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/sandbox.h"
 #include "core/local_url_handlers.h"
 #include "core/launcher.h"
-#include "kotato/json_settings.h"
 #include "core/ui_integration.h"
 #include "core/core_settings.h"
 #include "chat_helpers/emoji_keywords.h"
@@ -198,12 +197,10 @@ Application::~Application() {
 	Global::finish();
 	ThirdParty::finish();
 
-	Kotato::JsonSettings::Finish();
 	Instance = nullptr;
 }
 
 void Application::run() {
-	Kotato::JsonSettings::Start();
 	style::internal::StartFonts();
 
 	ThirdParty::start();
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 78d3a0c0a..a288d8545 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/update_checker.h"
 #include "core/sandbox.h"
 #include "base/concurrent_timer.h"
+#include "kotato/json_settings.h"
 
 namespace Core {
 namespace {
@@ -330,6 +331,7 @@ int Launcher::exec() {
 
 	// Must be started before Platform is started.
 	Logs::start(this);
+	Kotato::JsonSettings::Start();
 
 	// Must be started before Sandbox is created.
 	Platform::start();
@@ -359,6 +361,7 @@ int Launcher::exec() {
 
 	CrashReports::Finish();
 	Platform::finish();
+	Kotato::JsonSettings::Finish();
 	Logs::finish();
 
 	return result;