diff --git a/tomoscan/tomoscan_pso.py b/tomoscan/tomoscan_pso.py
index c9249a0e..4975b1f0 100644
--- a/tomoscan/tomoscan_pso.py
+++ b/tomoscan/tomoscan_pso.py
@@ -140,7 +140,11 @@ def end_scan(self):
         # Set the rotation speed to maximum
         self.epics_pvs['RotationSpeed'].put(self.max_rotation_speed)                
 
-        # Move the sample in.  Could be out if scan was aborted while taking flat fields
+        # Move the sample in (X/Y stage only).  Could be out if scan was aborted while
+        # taking flat fields.  Clear self.rotation_save first so that move_sample_in()
+        # does not restore the rotation to the end-of-scan angle — ReturnRotation in
+        # the base end_scan() handles the final rotation position.
+        self.rotation_save = None
         self.move_sample_in()
 
         # Call the base class method