diff --git a/ArchiSteamFarm/Events.cs b/ArchiSteamFarm/Events.cs
index 950a2167d..4c0ac9960 100644
--- a/ArchiSteamFarm/Events.cs
+++ b/ArchiSteamFarm/Events.cs
@@ -14,7 +14,7 @@ namespace ArchiSteamFarm {
 
 			Logging.LogGenericInfo("No bots are running, exiting");
 			await Task.Delay(5000).ConfigureAwait(false);
-			Program.Exit();
+			Program.Shutdown();
 		}
 	}
 }
diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs
index 236cc2255..985be66ea 100644
--- a/ArchiSteamFarm/Program.cs
+++ b/ArchiSteamFarm/Program.cs
@@ -60,7 +60,9 @@ namespace ArchiSteamFarm {
 		}
 
 		internal static void Restart() {
-			InitShutdownSequence();
+			if (!InitShutdownSequence()) {
+				return;
+			}
 
 			try {
 				Process.Start(Assembly.GetEntryAssembly().Location, string.Join(" ", Environment.GetCommandLineArgs().Skip(1)));
@@ -68,6 +70,7 @@ namespace ArchiSteamFarm {
 				Logging.LogGenericException(e);
 			}
 
+			ShutdownResetEvent.Set();
 			Environment.Exit(0);
 		}
 
@@ -133,7 +136,7 @@ namespace ArchiSteamFarm {
 			return !string.IsNullOrEmpty(result) ? result.Trim() : null;
 		}
 
-		private static void Shutdown() {
+		internal static void Shutdown() {
 			if (!InitShutdownSequence()) {
 				return;
 			}