diff --git a/frigate/ptz/autotrack.py b/frigate/ptz/autotrack.py
index 719abb2d4..79ab253ef 100644
--- a/frigate/ptz/autotrack.py
+++ b/frigate/ptz/autotrack.py
@@ -507,6 +507,10 @@ class PtzAutoTracker:
             while not self.move_queues[camera].empty():
                 self.move_queues[camera].get()
 
+            # clear tracked object
+            self.tracked_object[camera] = None
+            self.tracked_object_previous[camera] = None
+
             self.ptz_metrics[camera]["ptz_stopped"].wait()
             logger.debug(
                 f"Autotrack: Time is {time.time()}, returning to preset: {autotracker_config.return_preset}"
@@ -516,7 +520,3 @@ class PtzAutoTracker:
                 autotracker_config.return_preset.lower(),
             )
             self.ptz_metrics[camera]["ptz_reset"].set()
-
-            # clear tracked object
-            self.tracked_object[camera] = None
-            self.tracked_object_previous[camera] = None