diff --git a/binaries/data/mods/public/simulation/components/ProductionQueue.js b/binaries/data/mods/public/simulation/components/ProductionQueue.js
index 7800d59cf2..6b775d1fac 100644
--- a/binaries/data/mods/public/simulation/components/ProductionQueue.js
+++ b/binaries/data/mods/public/simulation/components/ProductionQueue.js
@@ -369,6 +369,11 @@ ProductionQueue.prototype.RemoveItem = function(id)
 
 ProductionQueue.prototype.SetAnimation = function(name)
 {
+	// In case the entity has a UnitAI discard the attempted change of
+	// animation as it would interfere with animation logic in UnitAI.
+	if (Engine.QueryInterface(this.entity, IID_UnitAI))
+		return;
+
 	const cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
 	if (cmpVisual)
 		cmpVisual.SelectAnimation(name, false, 1);
diff --git a/binaries/data/mods/public/simulation/components/tests/test_ProductionQueue.js b/binaries/data/mods/public/simulation/components/tests/test_ProductionQueue.js
index cdb1ba449f..d7f1dc0b6a 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_ProductionQueue.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_ProductionQueue.js
@@ -3,6 +3,7 @@ Engine.LoadComponentScript("interfaces/ProductionQueue.js");
 Engine.LoadComponentScript("interfaces/Researcher.js");
 Engine.LoadComponentScript("interfaces/Timer.js");
 Engine.LoadComponentScript("interfaces/Trainer.js");
+Engine.LoadComponentScript("interfaces/UnitAI.js");
 Engine.LoadComponentScript("interfaces/Upgrade.js");
 Engine.LoadComponentScript("Timer.js");