diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index c0ca97f172eab314008d9b4c6e0a1144dbb633f0..402975e315386a4f81197bd9021bd37f0f52d849 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -844,6 +844,14 @@ void MissionController::_recalcAltitudeRangeBearing()
                         missionMaxTelemetry = telemetryDistance;
                     }
                 }
+                else if (lastCoordinateItem == homeItem && !item->isSimpleItem()){
+                    missionDistance += qobject_cast<ComplexMissionItem*>(item)->surveyDistance();
+                    missionMaxTelemetry = qobject_cast<ComplexMissionItem*>(item)->greatestDistanceTo(homeItem->exitCoordinate());
+
+                    if (vtolCalc){
+                        cruiseDistance += qobject_cast<ComplexMissionItem*>(item)->surveyDistance(); //assume all survey missions undertaken in cruise
+                    }
+                }
                 lastCoordinateItem = item;
             }
         }