diff --git a/openflexure_microscope/api/default_extensions/autofocus.py b/openflexure_microscope/api/default_extensions/autofocus.py
index 089eae4c..507a9fac 100644
--- a/openflexure_microscope/api/default_extensions/autofocus.py
+++ b/openflexure_microscope/api/default_extensions/autofocus.py
@@ -325,7 +325,7 @@ class MoveAndMeasureAPI(ActionView):
 
         if microscope.has_real_stage():
             # Acquire microscope lock with 1s timeout
-            with microscope.lock(timeout=1):
+            with microscope.camera.lock, microscope.stage.lock:
                 return move_and_measure(microscope, dz=args.get("dz"))
 
         else: