diff --git a/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs b/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs
index 8aacf2de..a2713931 100644
--- a/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs
+++ b/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs
@@ -45,8 +45,6 @@ namespace AutoClient.Modes.FolderStore
                 {
                     SaveFile(folderFile);
                 }
-
-                slowModeHandler.Check();
                 
                 CheckAndSaveChanges();
             }
diff --git a/Tools/AutoClient/Modes/FolderStore/SlowModeHandler.cs b/Tools/AutoClient/Modes/FolderStore/SlowModeHandler.cs
index 0b17a53c..14db24ae 100644
--- a/Tools/AutoClient/Modes/FolderStore/SlowModeHandler.cs
+++ b/Tools/AutoClient/Modes/FolderStore/SlowModeHandler.cs
@@ -25,6 +25,8 @@
                     failureCount = 0;
                 }
             }
+
+            Check();
         }
 
         public void OnFailure()
@@ -36,9 +38,11 @@
                 slowMode = true;
                 recoveryCount = 0;
             }
+
+            Check();
         }
 
-        public void Check()
+        private void Check()
         {
             if (slowMode)
             {