diff --git a/Source/Game/Entities/Player/PlayerTaxi.cs b/Source/Game/Entities/Player/PlayerTaxi.cs
index 1bde0057a..eb0226af1 100644
--- a/Source/Game/Entities/Player/PlayerTaxi.cs
+++ b/Source/Game/Entities/Player/PlayerTaxi.cs
@@ -173,6 +173,8 @@ namespace Game.Entities
             if (m_TaxiDestinations.Empty())
                 return "";
 
+            Cypher.Assert(m_TaxiDestinations.Count >= 2);
+
             StringBuilder ss = new();
             ss.Append($"{m_flightMasterFactionId} ");
 
diff --git a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
index 7284e6660..f2642af72 100644
--- a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
@@ -123,6 +123,7 @@ namespace Game.Movement
             if (!active)
                 return;
 
+            owner.m_taxi.ClearTaxiDestinations();
             owner.Dismount();
             owner.RemoveUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.TaxiFlight);