diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 07c04bd90..cae3b189c 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -803,7 +803,7 @@ namespace ArchiSteamFarm {
 
 		private void HandleCallbacks() {
 			TimeSpan timeSpan = TimeSpan.FromMilliseconds(CallbackSleep);
-			while (KeepRunning) {
+			while (KeepRunning || SteamClient.IsConnected) {
 				CallbackManager.RunWaitCallbacks(timeSpan);
 			}
 		}
@@ -920,6 +920,12 @@ namespace ArchiSteamFarm {
 
 			Logging.LogGenericInfo("Connected to Steam!", BotName);
 
+			if (!KeepRunning) {
+				Logging.LogGenericInfo("Disconnecting...", BotName);
+				SteamClient.Disconnect();
+				return;
+			}
+
 			if (File.Exists(LoginKeyFile)) {
 				try {
 					LoginKey = File.ReadAllText(LoginKeyFile);