diff --git a/host/calibrate/HostCal.cpp b/host/calibrate/HostCal.cpp
index 60ba56f2..de562fdf 100644
--- a/host/calibrate/HostCal.cpp
+++ b/host/calibrate/HostCal.cpp
@@ -1117,6 +1117,12 @@ int HostCal::run()
         case 'S':
         case 's':
         {
+            m_mode = STATE_IDLE;
+            writeConfig();
+            if (m_isHotspot) {
+                writeRFParams();
+            }
+            writeSymbolAdjust();
             yaml::Serialize(m_conf, m_confFile.c_str(), yaml::SerializeConfig(4, 64, false, false));
             LogMessage(LOG_CAL, " - Saved configuration to %s", m_confFile.c_str());
             if (writeFlash()) {