diff --git a/OpenRA.Mods.Common/Activities/Move/Move.cs b/OpenRA.Mods.Common/Activities/Move/Move.cs
index c264de74dd..1eee6012fa 100644
--- a/OpenRA.Mods.Common/Activities/Move/Move.cs
+++ b/OpenRA.Mods.Common/Activities/Move/Move.cs
@@ -386,6 +386,9 @@ namespace OpenRA.Mods.Common.Activities
 
 			public override Activity Tick(Actor self)
 			{
+				if (Move.mobile.IsTraitDisabled)
+					return this;
+
 				var ret = InnerTick(self, Move.mobile);
 				Move.mobile.IsMoving = ret is MovePart;