diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
index 509e760ce5ccac7aca09d8001d2a321c98709c7a..6238d683e28c489d6084624d728f59fad194c20a 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
@@ -267,6 +267,7 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
 
 void SensorsComponentController::_refreshParams(void)
 {
+    // Pull specified params first so red/green indicators update quickly
     _autopilot->refreshParameter("CAL_MAG0_ID");
     _autopilot->refreshParameter("CAL_GYRO0_ID");
     _autopilot->refreshParameter("CAL_ACC0_ID");
@@ -276,6 +277,9 @@ void SensorsComponentController::_refreshParams(void)
     _autopilot->refreshParameter("CAL_MAG1_ROT");
     _autopilot->refreshParameter("CAL_MAG2_ROT");
     _autopilot->refreshParameter("SENS_BOARD_ROT");
+    
+    // Pull full set in order to get all cal values back
+    _autopilot->refreshAllParameters();
 }
 
 bool SensorsComponentController::fixedWing(void)