diff --git a/libraries/APM_Control/AP_AutoTune.cpp b/libraries/APM_Control/AP_AutoTune.cpp
index 83f81f2fa3..84d79a1bba 100644
--- a/libraries/APM_Control/AP_AutoTune.cpp
+++ b/libraries/APM_Control/AP_AutoTune.cpp
@@ -143,6 +143,7 @@ void AP_AutoTune::stop(void)
     if (running) {
         running = false;
         save_gains(restore);
+        current = restore;
         rpid.set_slew_limit_scale(45);
     }
 }