diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml
index 6ec6a87a8825442189b246c25d568e6c4536af16..465389462609dcb3983d07b0cfba7819988ed8b4 100644
--- a/src/ui/toolbar/MainToolBarIndicators.qml
+++ b/src/ui/toolbar/MainToolBarIndicators.qml
@@ -322,7 +322,7 @@ Row {
 
             MenuItem {
                 checkable:      true
-                checked:        vehicle.active
+                checked:        vehicle ? vehicle.active : false
                 onTriggered:    multiVehicleManager.activeVehicle = vehicle
 
                 property int vehicleId: Number(text.split(" ")[1])
@@ -360,6 +360,7 @@ Row {
     //-- Mode Selector
 
     Item {
+        id:     flightModeSelector
         width:  selectorRow.width * 1.1
         height: mainWindow.tbCellHeight
         anchors.verticalCenter: parent.verticalCenter
@@ -425,7 +426,7 @@ Row {
 
         Connections {
             target:                 multiVehicleManager
-            onActiveVehicleChanged: parent.updateFlightModesMenu
+            onActiveVehicleChanged: flightModeSelector.updateFlightModesMenu
         }
 
         MouseArea {