diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py
index b6a2f8b2..82a93f11 100644
--- a/daq/src/aaredaq/daq.py
+++ b/daq/src/aaredaq/daq.py
@@ -649,6 +649,8 @@ class AareDAQ:
         if request.start is not None:
             self.__devs.smargon.target = request.start
 
+        omega_start = self.omega
+
         self.__devs.transmission.wait()
         if request.start is not None:
             self.__devs.smargon.wait()
@@ -689,8 +691,10 @@ class AareDAQ:
             self.__devs.aerotech.wait_scan_done(total_time + 60)
 
         self.__devs.aerotech.reset()
+        self.__devs.aerotech.move(omega_start, wait=False, speed=180.0, direct=True)
         result = self.__jfjoch.wait_till_done(60)
         self.__aare.sample_collected(self.sample)
+        self.__devs.aerotech.move(omega_start, wait=True, speed=180.0, direct=True)
 
         if self.sample is not None and self.sample.db_id is not None:
             self.save_screenshot_db(self.sample.db_id, "after_dc")