diff --git a/pioreactor/actions/od_calibration_from_standards.py b/pioreactor/actions/od_calibration_from_standards.py
index e9d16294..0722b55d 100644
--- a/pioreactor/actions/od_calibration_from_standards.py
+++ b/pioreactor/actions/od_calibration_from_standards.py
@@ -134,6 +134,7 @@ def plot_data(
 
 
 def start_recording_standards(st: Stirrer, signal_channel):
+    target_rpm = st.target_rpm
     voltages = []
     od600_values = []
     click.echo("Starting OD recordings.")
@@ -174,6 +175,8 @@ def get_voltage_from_adc() -> float:
         od600_values.append(standard_od)
         voltages.append(voltage)
 
+        st.set_target_rpm(0)
+
         for i in range(len(od600_values)):
             click.clear()
             plot_data(
@@ -194,6 +197,8 @@ def get_voltage_from_adc() -> float:
         click.echo("Confirm vial outside is dry and clean.")
         while not click.confirm("Continue?", default=True):
             pass
+        st.set_target_rpm(target_rpm)
+        st.block_until_rpm_is_close_to_target(abs_tolerance=120)
         sleep(1.0)
 
     click.clear()