diff --git a/OpenRA.Game/Traits/Activities/Idle.cs b/OpenRA.Game/Traits/Activities/Idle.cs
index 9c5eb213f6..137060f786 100644
--- a/OpenRA.Game/Traits/Activities/Idle.cs
+++ b/OpenRA.Game/Traits/Activities/Idle.cs
@@ -12,6 +12,6 @@ namespace OpenRA.Traits.Activities
 {
 	public class Idle : CancelableActivity
 	{
-		public override IActivity Tick(Actor self) { return NextActivity; }
+		public override IActivity Tick(Actor self) { return NextActivity ?? this; }
 	}
 }