diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp
index 055f3873e..60d50a4a8 100644
--- a/Telegram/SourceFiles/main/main_domain.cpp
+++ b/Telegram/SourceFiles/main/main_domain.cpp
@@ -340,11 +340,14 @@ bool Domain::removePasscodeIfEmpty() {
 		return false;
 	}
 	Local::reset();
+
+	// We completely logged out, remove the passcode if it was there.
+	if (Core::App().passcodeLocked()) {
+		Core::App().unlockPasscode();
+	}
 	if (!_local->hasLocalPasscode()) {
 		return false;
 	}
-	// We completely logged out, remove the passcode if it was there.
-	Core::App().unlockPasscode();
 	_local->setPasscode(QByteArray());
 	return true;
 }