diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index 3fa6d173e5d4d53d605b2877b7c3630943171cb8..2c956ed73b795bf1a8440e2fba27f5f302df8bba 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -84,7 +84,8 @@ void MultiVehicleManager::setToolbox(QGCToolbox *toolbox)
 
 void MultiVehicleManager::_vehicleHeartbeatInfo(LinkInterface* link, int vehicleId, int vehicleMavlinkVersion, int vehicleFirmwareType, int vehicleType)
 {
-    if (_ignoreVehicleIds.contains(vehicleId) || getVehicleById(vehicleId)) {
+    if (_ignoreVehicleIds.contains(vehicleId) || getVehicleById(vehicleId)
+            || vehicleId == 0) {
         return;
     }