diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index f738b93db0c7a9fc462ba617bc34dcd7b67bb1b5..613f194aa70f47b934e3da134a76b1b8775b0d59 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -125,7 +125,10 @@ void MissionController::_newMissionItemsAvailableFromVehicle(void)
 
         _missionItemsRequested = false;
 
-        MissionSettingsComplexItem::scanForMissionSettings(_visualItems, _activeVehicle);
+        if (_editMode) {
+            // Scan for mission settings
+            MissionSettingsComplexItem::scanForMissionSettings(_visualItems, _activeVehicle);
+        }
 
         _initAllVisualItems();
         emit newItemsFromVehicle();