diff --git a/game/ato/flightplans/custom.py b/game/ato/flightplans/custom.py
index 3b4da67b..00733f98 100644
--- a/game/ato/flightplans/custom.py
+++ b/game/ato/flightplans/custom.py
@@ -68,7 +68,7 @@ class CustomFlightPlan(FlightPlan[CustomLayout]):
             else self.layout.departure
         )
         return_time = self.total_time_between_waypoints(self.tot_waypoint, arrival)
-        return self.tot + return_time
+        return self.mission_departure_time + return_time
 
 
 class Builder(IBuilder[CustomFlightPlan, CustomLayout]):
diff --git a/game/ato/flightplans/standard.py b/game/ato/flightplans/standard.py
index 8d97aab9..c6511f2a 100644
--- a/game/ato/flightplans/standard.py
+++ b/game/ato/flightplans/standard.py
@@ -93,4 +93,4 @@ class StandardFlightPlan(FlightPlan[LayoutT], ABC):
         return_time = self.total_time_between_waypoints(
             self.tot_waypoint, self.layout.arrival
         )
-        return self.tot + return_time
+        return self.mission_departure_time + return_time