diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index a60edf1118f0ea1b05c32b790108ead39207b448..6dd92e73c1ed3ab4dd335b3ae9a37728643af957 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -194,13 +194,9 @@ void MultiVehicleManager::_autopilotPluginReadyChanged(bool pluginReady)
         return;
     }
     
-    if (_activeVehicle) {
-        if (_activeVehicle->autopilotPlugin() == autopilot) {
-            _parameterReadyVehicleAvailable = pluginReady;
-            emit parameterReadyVehicleAvailableChanged(pluginReady);
-        }
-    } else {
-        qWarning() << "Why no active vehicle?";
+    if (autopilot->vehicle() == _activeVehicle) {
+        _parameterReadyVehicleAvailable = pluginReady;
+        emit parameterReadyVehicleAvailableChanged(pluginReady);
     }
 }