diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index 084cf876f6..26ae0d75d4 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1523,8 +1523,8 @@ UnitAI.prototype.UnitFsmSpec = {
 
 		"IDLE": {
 			"Order.Cheer": function() {
-				// Do not cheer if there is no cheering time.
-				if (!this.cheeringTime)
+				// Do not cheer if there is no cheering time and we are not idle yet.
+				if (!this.cheeringTime || !this.isIdle)
 					return { "discardOrder": true };
 
 				this.SetNextState("CHEERING");