diff --git a/OpenRA.Game/Traits/DrawLineToTarget.cs b/OpenRA.Game/Traits/DrawLineToTarget.cs
index 91021d1acb..cae3c36bbe 100644
--- a/OpenRA.Game/Traits/DrawLineToTarget.cs
+++ b/OpenRA.Game/Traits/DrawLineToTarget.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
@@ -46,6 +47,10 @@ namespace OpenRA.Traits
 		
 		public void RenderAfterWorld (Actor self)
 		{
+			var activity = self.GetCurrentActivity();
+			if (activity == null || activity is Idle)
+				return;
+			
 			var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt);
 			if ((lifetime <= 0 || --lifetime <= 0) && !force)
 				return;