diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 407f23563..89bbaa759 100644
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -222,8 +222,8 @@ namespace ArchiSteamFarm {
 			}
 
 			await CardsFarmer.StopFarming().ConfigureAwait(false);
-			SteamClient.Disconnect();
 			IsRunning = false;
+			SteamClient.Disconnect();
 		}
 
 		private async Task<bool> Shutdown(string botNameToShutdown) {
@@ -359,7 +359,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (callback.UserInitiated) {
+			if (!IsRunning) {
 				return;
 			}
 
diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs
index 311b3e0a5..361e75390 100644
--- a/ArchiSteamFarm/Program.cs
+++ b/ArchiSteamFarm/Program.cs
@@ -47,7 +47,7 @@ namespace ArchiSteamFarm {
 		private static readonly ManualResetEvent ShutdownResetEvent = new ManualResetEvent(false);
 		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
 		private static readonly string ExecutablePath = Assembly.Location;
-        private static readonly AssemblyName AssemblyName = Assembly.GetName();
+		private static readonly AssemblyName AssemblyName = Assembly.GetName();
 		private static readonly string ExeName = AssemblyName.Name + ".exe";
 		private static readonly string Version = AssemblyName.Version.ToString();