diff --git a/src/Modules/MatchTrackerModule/Controllers/MatchTrackerEventController.cs b/src/Modules/MatchTrackerModule/Controllers/MatchTrackerEventController.cs
index 5ba23a519..ffa353ba7 100644
--- a/src/Modules/MatchTrackerModule/Controllers/MatchTrackerEventController.cs
+++ b/src/Modules/MatchTrackerModule/Controllers/MatchTrackerEventController.cs
@@ -31,7 +31,15 @@ public Task OnBeginMatchAsync(object sender, EventArgs args)
     }
 
     [Subscribe(FlowControlEvent.MatchStarted)]
-    public Task OnMatchStarted(object sender, EventArgs args) => tracker.BeginMatchAsync();
+    public Task OnMatchStarted(object sender, EventArgs args)
+    {
+        if (settings.AutomaticTracking)
+        {
+            return Task.CompletedTask;
+        }
+        
+        return tracker.BeginMatchAsync();
+    }
 
     [Subscribe(FlowControlEvent.MatchEnded)]
     public Task OnMatchEnded(object sender, EventArgs args) => tracker.EndMatchAsync();