diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 82309fac29f4c0284aa1bdaa1c35d8f9dc42366a..a11afb3317e70bf6a2a32d068025d06bba9b30f0 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -1229,8 +1229,6 @@ void MissionController::_recalcWaypointLines(void)
         _waypointPath.append(QVariant::fromValue(QGeoCoordinate(0, 0)));
     }
 
-    emit waypointLinesChanged();
-    emit directionArrowsChanged();
     emit waypointPathChanged();
 }
 
diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h
index cdb517262e0aae34f5ac96efb39889bf6e990ab6..62b4235ec26b74c160022d7a93262207bc76ed8d 100644
--- a/src/MissionManager/MissionController.h
+++ b/src/MissionManager/MissionController.h
@@ -68,9 +68,9 @@ public:
     } MissionFlightStatus_t;
 
     Q_PROPERTY(QmlObjectListModel*  visualItems             READ visualItems                NOTIFY visualItemsChanged)
-    Q_PROPERTY(QmlObjectListModel*  waypointLines           READ waypointLines              NOTIFY waypointLinesChanged)        ///< Used by Plan view only for interactive editing
+    Q_PROPERTY(QmlObjectListModel*  waypointLines           READ waypointLines              CONSTANT)                           ///< Used by Plan view only for interactive editing
     Q_PROPERTY(QVariantList         waypointPath            READ waypointPath               NOTIFY waypointPathChanged)         ///< Used by Fly view only for static display
-    Q_PROPERTY(QmlObjectListModel*  directionArrows         READ directionArrows            NOTIFY directionArrowsChanged)
+    Q_PROPERTY(QmlObjectListModel*  directionArrows         READ directionArrows            CONSTANT)
     Q_PROPERTY(QStringList          complexMissionItemNames READ complexMissionItemNames    NOTIFY complexMissionItemNamesChanged)
     Q_PROPERTY(QGeoCoordinate       plannedHomePosition     READ plannedHomePosition        NOTIFY plannedHomePositionChanged)
 
@@ -206,8 +206,6 @@ public:
 
 signals:
     void visualItemsChanged             (void);
-    void waypointLinesChanged           (void);
-    void directionArrowsChanged         (void);
     void waypointPathChanged            (void);
     void newItemsFromVehicle            (void);
     void missionDistanceChanged         (double missionDistance);
diff --git a/src/MissionManager/MissionControllerTest.cc b/src/MissionManager/MissionControllerTest.cc
index 29d3f2c9c75ca5731933e1eb108ab9893991b797..effced1e7205cc95445fca08cdb2a483815ffc32 100644
--- a/src/MissionManager/MissionControllerTest.cc
+++ b/src/MissionManager/MissionControllerTest.cc
@@ -48,7 +48,6 @@ void MissionControllerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType)
 
     // MissionController signals
     _rgMissionControllerSignals[visualItemsChangedSignalIndex] =    SIGNAL(visualItemsChanged());
-    _rgMissionControllerSignals[waypointLinesChangedSignalIndex] =  SIGNAL(waypointLinesChanged());
 
     // Master controller pulls offline vehicle info from settings
     qgcApp()->toolbox()->settingsManager()->appSettings()->offlineEditingFirmwareType()->setRawValue(firmwareType);
@@ -62,7 +61,7 @@ void MissionControllerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType)
     _masterController->start(false /* flyView */);
 
     // All signals should some through on start
-    QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(visualItemsChangedSignalMask | waypointLinesChangedSignalMask), true);
+    QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(visualItemsChangedSignalMask), true);
     _multiSpyMissionController->clearAllSignals();
 
     QmlObjectListModel* visualItems = _missionController->visualItems();
@@ -120,8 +119,6 @@ void MissionControllerTest::_testAddWaypointWorker(MAV_AUTOPILOT firmwareType)
 
     _missionController->insertSimpleMissionItem(coordinate, _missionController->visualItems()->count());
 
-    QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(waypointLinesChangedSignalMask), true);
-
     QmlObjectListModel* visualItems = _missionController->visualItems();
     QVERIFY(visualItems);
 
diff --git a/src/MissionManager/MissionControllerTest.h b/src/MissionManager/MissionControllerTest.h
index 101c20482dc9841926c97cd2a804bc96aa69323a..88a4ec6e034a87a334591d3c04ce3c641093d3be 100644
--- a/src/MissionManager/MissionControllerTest.h
+++ b/src/MissionManager/MissionControllerTest.h
@@ -70,13 +70,11 @@ private:
 
     enum {
         visualItemsChangedSignalIndex = 0,
-        waypointLinesChangedSignalIndex,
         missionControllerMaxSignalIndex
     };
 
     enum {
         visualItemsChangedSignalMask =                 1 << visualItemsChangedSignalIndex,
-        waypointLinesChangedSignalMask =                1 << waypointLinesChangedSignalIndex,
     };
 
     MultiSignalSpy*     _multiSpyMissionController;