diff --git a/OpenRA.Mods.RA/Air/Fly.cs b/OpenRA.Mods.RA/Air/Fly.cs
index 00932de85d..0ef39e1256 100755
--- a/OpenRA.Mods.RA/Air/Fly.cs
+++ b/OpenRA.Mods.RA/Air/Fly.cs
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Air
 
 		public override Activity Tick(Actor self)
 		{
-			if (IsCanceled)
+			if (IsCanceled || !target.IsValidFor(self))
 				return NextActivity;
 
 			// Inside the target annulus, so we're done
diff --git a/OpenRA.Mods.RA/Air/HeliFly.cs b/OpenRA.Mods.RA/Air/HeliFly.cs
index 881faf0daf..c79304d386 100755
--- a/OpenRA.Mods.RA/Air/HeliFly.cs
+++ b/OpenRA.Mods.RA/Air/HeliFly.cs
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA.Air
 
 		public override Activity Tick(Actor self)
 		{
-			if (IsCanceled)
+			if (IsCanceled || !target.IsValidFor(self))
 				return NextActivity;
 
 			if (AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))