diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 71ce27b8a..5104f55f8 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -501,6 +501,11 @@ namespace ArchiSteamFarm {
 			}
 
 			if (BotConfig.ShutdownOnFarmingFinished) {
+				if (farmedSomething || (Program.GlobalConfig.IdleFarmingPeriod == 0)) {
+					Stop();
+					return;
+				}
+
 				if (SkipFirstShutdown) {
 					SkipFirstShutdown = false;
 				} else {