diff --git a/OpenRA.Mods.RA/Buildings/Building.cs b/OpenRA.Mods.RA/Buildings/Building.cs
index 83a7e30512..b67132d957 100644
--- a/OpenRA.Mods.RA/Buildings/Building.cs
+++ b/OpenRA.Mods.RA/Buildings/Building.cs
@@ -107,7 +107,7 @@ namespace OpenRA.Mods.RA.Buildings
 		public bool BuildComplete { get; private set; }
 		[Sync] readonly CPos topLeft;
 		readonly Actor self;
-		public readonly bool UseMakeAnimation;
+		public readonly bool SkipMakeAnimation;
 
 		PowerManager PlayerPower;
 
@@ -141,7 +141,7 @@ namespace OpenRA.Mods.RA.Buildings
 				.Select(c => Pair.New(c, SubCell.FullCell)).ToArray();
 
 			CenterPosition = init.world.Map.CenterOfCell(topLeft) + FootprintUtils.CenterOffset(init.world, Info);
-			UseMakeAnimation = !init.Contains<SkipMakeAnimsInit>();
+			SkipMakeAnimation = init.Contains<SkipMakeAnimsInit>();
 		}
 
 		public int GetPowerUsage()
@@ -170,7 +170,7 @@ namespace OpenRA.Mods.RA.Buildings
 
 		public void Created(Actor self)
 		{
-			if (!UseMakeAnimation)
+			if (SkipMakeAnimation || !self.HasTrait<WithMakeAnimation>())
 				NotifyBuildingComplete(self);
 		}
 
diff --git a/OpenRA.Mods.RA/Render/WithMakeAnimation.cs b/OpenRA.Mods.RA/Render/WithMakeAnimation.cs
index 484918f1c4..230d03ef39 100644
--- a/OpenRA.Mods.RA/Render/WithMakeAnimation.cs
+++ b/OpenRA.Mods.RA/Render/WithMakeAnimation.cs
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Render
 			renderBuilding = self.Trait<RenderBuilding>();
 
 			var building = self.Trait<Building>();
-			if (building.UseMakeAnimation)
+			if (!building.SkipMakeAnimation)
 			{
 				renderBuilding.PlayCustomAnimThen(self, info.Sequence, () => 
 				{