diff --git a/src/AutoPilotPlugins/PX4/RadioComponentController.cc b/src/AutoPilotPlugins/PX4/RadioComponentController.cc
index 914c706..e642f84 100644
--- a/src/AutoPilotPlugins/PX4/RadioComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/RadioComponentController.cc
@@ -428,6 +428,13 @@ void RadioComponentController::_inputStickMin(enum rcCalFunctions function, int
             } else {
                 _rgChannelInfo[channel].rcMin = value;
             }
+
+            // Check if this is throttle and set trim accordingly
+            if (function == rcCalFunctionThrottle) {
+                _rgChannelInfo[channel].rcTrim = value;
+            }
+            // XXX to support configs which can reverse they need to check a reverse
+            // flag here and not do this.
             
             _advanceState();
         }