diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index e645c46516..40be7253c1 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1047,7 +1047,7 @@ void Application::preventWindowActivation() {
 void Application::QuitAttempt() {
 	auto prevents = false;
 	if (AuthSession::Exists() && !Sandbox::Instance().isSavingSession()) {
-		if (auto mainwidget = App::main()) {
+		if (const auto mainwidget = App::main()) {
 			if (mainwidget->isQuitPrevent()) {
 				prevents = true;
 			}
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 6a2970adec..52039f9b60 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -3752,7 +3752,7 @@ void MainWidget::updateOnline(bool gotOtherOffline) {
 	if (this != App::main()) return;
 	InvokeQueued(this, [=] { session().checkAutoLock(); });
 
-	bool isOnline = App::wnd()->isActive();
+	bool isOnline = !App::quitting() && App::wnd()->isActive();
 	int updateIn = Global::OnlineUpdatePeriod();
 	if (isOnline) {
 		auto idle = psIdleTime();