diff --git a/src/Joystick/Joystick.cc b/src/Joystick/Joystick.cc
index cb7a00b..53f3454 100644
--- a/src/Joystick/Joystick.cc
+++ b/src/Joystick/Joystick.cc
@@ -445,7 +445,7 @@ void Joystick::run(void)
             }
         }
 
-        if (_activeVehicle->joystickEnabled() && _calibrated) {
+        if (_activeVehicle->joystickEnabled() && !_calibrationMode && _calibrated) {
             int     axis = _rgFunctionAxis[rollFunction];
             float   roll = _adjustRange(_rgAxisValues[axis], _rgCalibration[axis], _deadband);