diff --git a/OpenRA.Mods.Common/Activities/Resupply.cs b/OpenRA.Mods.Common/Activities/Resupply.cs
index 05ed14b3c3..cc5a81c8bf 100644
--- a/OpenRA.Mods.Common/Activities/Resupply.cs
+++ b/OpenRA.Mods.Common/Activities/Resupply.cs
@@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Activities
 
 		void OnResupplyEnding(Actor self, bool isHostInvalid = false)
 		{
-			var rp = host.Actor.TraitOrDefault<RallyPoint>();
+			var rp = !isHostInvalid ? host.Actor.TraitOrDefault<RallyPoint>() : null;
 			if (aircraft != null)
 			{
 				if (wasRepaired || isHostInvalid || (!stayOnResupplier && aircraft.Info.TakeOffOnResupply))