diff --git a/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs b/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
index 42891b27cf..3104d52df9 100644
--- a/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
@@ -38,12 +38,10 @@ namespace OpenRA.Mods.Common.Activities
 			}
 			else
 			{
-				// HACK: Append NextInQueue to TakeOff to avoid moving to the Rallypoint (if NextInQueue is non-null).
 				ChildActivity = ActivityUtils.SequenceActivities(
 					aircraft.GetResupplyActivities(host)
 					.Append(new AllowYieldingReservation(self))
-					.Append(new TakeOff(self))
-					.Append(NextInQueue)
+					.Append(new TakeOff(self, (a, b, c) => NextInQueue == null && b.NextInQueue == null))
 					.ToArray());
 			}
 		}
diff --git a/OpenRA.Mods.Common/Activities/Air/TakeOff.cs b/OpenRA.Mods.Common/Activities/Air/TakeOff.cs
index 0371a6b58e..989f2bc6f5 100644
--- a/OpenRA.Mods.Common/Activities/Air/TakeOff.cs
+++ b/OpenRA.Mods.Common/Activities/Air/TakeOff.cs
@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 
@@ -18,11 +19,19 @@ namespace OpenRA.Mods.Common.Activities
 	{
 		readonly Aircraft aircraft;
 		readonly IMove move;
+		Func<Actor, Activity, CPos, bool> moveToRallyPoint;
 
 		public TakeOff(Actor self)
 		{
 			aircraft = self.Trait<Aircraft>();
 			move = self.Trait<IMove>();
+			moveToRallyPoint = (actor, activity, pos) => NextActivity == null;
+		}
+
+		public TakeOff(Actor self, Func<Actor, Activity, CPos, bool> moveToRallyPoint)
+			: this(self)
+		{
+			this.moveToRallyPoint = moveToRallyPoint;
 		}
 
 		public override Activity Tick(Actor self)
@@ -43,10 +52,10 @@ namespace OpenRA.Mods.Common.Activities
 			var destination = rp != null ? rp.Location :
 				(hasHost ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
 
-			if (NextInQueue == null)
+			if (moveToRallyPoint(self, this, destination))
 				return new AttackMoveActivity(self, move.MoveTo(destination, 1));
 			else
-				return NextInQueue;
+				return NextActivity;
 		}
 	}
 }