diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index eeb7d9a601..6e5f8987bc 100755
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -55,7 +55,7 @@ namespace OpenRa.Game
 			{
 				var a = currentActivity;
 				currentActivity = a.Tick(this) ?? new Idle();
-				if (a == currentActivity) break;
+				if (a == currentActivity || currentActivity is Idle) break;
 			}
 
 			foreach (var tick in traits.WithInterface<ITick>())