diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
index 6056113c0b..9ca9e7aaeb 100644
--- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
@@ -112,7 +112,11 @@ namespace OpenRA.Mods.Common.Activities
 						new FlyCircleTimed(self, plane.Info.NumberOfTicksToVerifyAvailableAirport),
 						this);
 				else
+				{
+					// Prevent an infinite loop in case we'd return to the activity that called ReturnToBase in the first place. Go idle instead.
+					Cancel(self);
 					return NextActivity;
+				}
 			}
 
 			List<Activity> landingProcedures = new List<Activity>();