diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua
index 88ca5ee7a..c390ce0a7 100644
--- a/Moose Development/Moose/Ops/FlightGroup.lua	
+++ b/Moose Development/Moose/Ops/FlightGroup.lua	
@@ -3777,10 +3777,15 @@ function FLIGHTGROUP:AddWaypoint(Coordinate, Speed, AfterWaypointWithID, Altitud
 
   -- Set waypoint index.
   local wpnumber=self:GetWaypointIndexAfterID(AfterWaypointWithID)
- 
+  
   -- Speed in knots.
   Speed=Speed or self:GetSpeedCruise()
   
+  local mission = self:GetMissionCurrent()
+  if mission and not self.isHelo then
+    Speed = mission.missionSpeed and mission.missionSpeed or self:GetSpeedCruise()
+  end
+  
   -- Alt type default is barometric (ASL). For helos we use radar (AGL).
   local alttype=COORDINATE.WaypointAltType.BARO
   if self.isHelo then