diff --git a/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs
index 823a9a3be7..ff87de29fa 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs
@@ -44,7 +44,9 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		public void Delivered(Actor self)
 		{
-			wsb.CancelCustomAnimation(self);
+			// Animation has already been cancelled by TraitDisabled below
+			if (!IsTraitDisabled)
+				wsb.CancelCustomAnimation(self);
 		}
 
 		protected override void TraitDisabled(Actor self)