diff --git a/Scalar.Common/Maintenance/ConfigStep.cs b/Scalar.Common/Maintenance/ConfigStep.cs
index e6bbd1deb2..5db5a6bca6 100644
--- a/Scalar.Common/Maintenance/ConfigStep.cs
+++ b/Scalar.Common/Maintenance/ConfigStep.cs
@@ -163,6 +163,8 @@ public bool TrySetConfig(out string error)
                 return false;
             }
 
+            this.ConfigureWatchmanIntegration();
+
             error = null;
             return true;
         }
@@ -170,7 +172,6 @@ public bool TrySetConfig(out string error)
         protected override void PerformMaintenance()
         {
             this.TrySetConfig(out _);
-            this.ConfigureWatchmanIntegration();
         }
 
         private bool TrySetConfig(Dictionary<string, string> configSettings, bool isRequired, out string error)