diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index ee0cf8687246b79e2e7dede35b478844a50b9ebb..bc3efe249229831b12900f5364326fd0610686f1 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -891,7 +891,10 @@ void Vehicle::setJoystickEnabled(bool enabled)
     if (!fact) {
         qCWarning(JoystickLog) << "Missing COM_RC_IN_MODE parameter";
     }
-    fact->setValue(enabled ? 1 : 0);
+    
+    if (fact->value().toInt() != 2) {
+        fact->setValue(enabled ? 1 : 0);
+    }
     
     _joystickEnabled = enabled;
     _startJoystick(_joystickEnabled);