diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
index 59f416f13b..8ab5610403 100644
--- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -563,8 +563,14 @@ namespace OpenRA.Mods.Common.Traits
 			}
 			else if (order.OrderString == "Stop")
 			{
-				UnReserve();
 				self.CancelActivity();
+				if (GetActorBelow() != null)
+				{
+					self.QueueActivity(new ResupplyAircraft(self));
+					return;
+				}
+
+				UnReserve();
 
 				// TODO: Implement INotifyBecomingIdle instead
 				if (!IsPlane && Info.LandWhenIdle)