diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
index 75fb8d5065..b3ecb28df5 100644
--- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -859,6 +859,10 @@ namespace OpenRA.Mods.Common.Traits
 			}
 			else if (order.OrderString == "ReturnToBase" && rearmable != null && rearmable.Info.RearmActors.Any())
 			{
+				// Don't restart activity every time deploy hotkey is triggered
+				if (self.CurrentActivity is ReturnToBase)
+					return;
+
 				if (!order.Queued)
 					UnReserve();