diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index b94aece55e07cedafa68d83975a4a7a25c9ce73e..3920dfe8853a2a6efbf04b73646f87a87aaa8ae7 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -1258,6 +1258,9 @@ void MissionController::_recalcFlightPathSegments(void)
     _directionArrows.clear();
     _incompleteComplexItemLines.clearAndDeleteContents();
 
+    // Mission Settings item needs to start with no segment
+    lastFlyThroughVI->setSimpleFlighPathSegment(nullptr);
+
     // Grovel through the list of items keeping track of things needed to correctly draw waypoints lines
 
     for (int i=1; i<_visualItems->count(); i++) {
@@ -1490,9 +1493,10 @@ void MissionController::_recalcMissionFlightStatus()
     // both relative altitude.
 
     // No values for first item
-    lastFlyThroughVI->setAltDifference(0.0);
-    lastFlyThroughVI->setAzimuth(0.0);
-    lastFlyThroughVI->setDistance(0.0);
+    lastFlyThroughVI->setAltDifference(0);
+    lastFlyThroughVI->setAzimuth(0);
+    lastFlyThroughVI->setDistance(0);
+    lastFlyThroughVI->setDistanceFromStart(0);
 
     _minAMSLAltitude = _maxAMSLAltitude = _settingsItem->coordinate().altitude();
 
@@ -1514,8 +1518,9 @@ void MissionController::_recalcMissionFlightStatus()
         }
 
         // Assume the worst
-        item->setAzimuth(0.0);
-        item->setDistance(0.0);
+        item->setAzimuth(0);
+        item->setDistance(0);
+        item->setDistanceFromStart(0);
 
         // Look for speed changed
         double newSpeed = item->specifiedFlightSpeed();