diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 377672d47..ef672f3d0 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -315,7 +315,11 @@ namespace ArchiSteamFarm {
 			return false;
 		}
 
+		internal void OnFarmingStopped() => ResetGamesPlayed();
+
 		internal async Task OnFarmingFinished(bool farmedSomething) {
+			OnFarmingStopped();
+
 			if ((farmedSomething || !FirstTradeSent) && BotConfig.SendOnFarmingFinished) {
 				FirstTradeSent = true;
 				await ResponseSendTrade(BotConfig.SteamMasterID).ConfigureAwait(false);
@@ -326,11 +330,8 @@ namespace ArchiSteamFarm {
 					SkipFirstShutdown = false;
 				} else {
 					Stop();
-					return;
 				}
 			}
-
-			ResetGamesPlayed();
 		}
 
 		internal async Task<string> Response(ulong steamID, string message) {
diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs
index 885d1daad..d4b7d571e 100755
--- a/ArchiSteamFarm/CardsFarmer.cs
+++ b/ArchiSteamFarm/CardsFarmer.cs
@@ -173,7 +173,7 @@ namespace ArchiSteamFarm {
 			FarmResetEvent.Set();
 
 			Logging.LogGenericInfo("Waiting for reaction...", Bot.BotName);
-			for (byte i = 0; (i < Program.GlobalConfig.HttpTimeout) && NowFarming; i++) {
+			for (byte i = 0; (i < 5) && NowFarming; i++) {
 				await Utilities.SleepAsync(1000).ConfigureAwait(false);
 			}
 
@@ -183,6 +183,7 @@ namespace ArchiSteamFarm {
 
 			FarmResetEvent.Reset();
 			Logging.LogGenericInfo("Farming stopped!", Bot.BotName);
+			Bot.OnFarmingStopped();
 			FarmingSemaphore.Release();
 		}