diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index b6a3dfbb89..15e439ffc6 100644
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -44,7 +44,12 @@ namespace OpenRA
 		public bool WillDispose { get; private set; }
 		public bool Disposed { get; private set; }
 
-		public Activity CurrentActivity { get; private set; }
+		Activity currentActivity;
+		public Activity CurrentActivity
+		{
+			get { return Activity.SkipDoneActivities(currentActivity); }
+			private set { currentActivity = value; }
+		}
 
 		public int Generation;
 		public Actor ReplacedByActor;