diff --git a/OpenRA.Game/Activities/Activity.cs b/OpenRA.Game/Activities/Activity.cs
index c781931469..b4115edd5e 100644
--- a/OpenRA.Game/Activities/Activity.cs
+++ b/OpenRA.Game/Activities/Activity.cs
@@ -50,7 +50,12 @@ namespace OpenRA.Activities
 	{
 		public ActivityState State { get; private set; }
 
-		protected Activity ChildActivity { get; private set; }
+		Activity childActivity;
+		protected Activity ChildActivity
+		{
+			get { return SkipDoneActivities(childActivity); }
+			private set { childActivity = value; }
+		}
 
 		Activity nextActivity;
 		public Activity NextActivity