diff --git a/OpenRA.Mods.Cnc/Traits/MadTank.cs b/OpenRA.Mods.Cnc/Traits/MadTank.cs
index f1a39fb7e9..a00cad747f 100644
--- a/OpenRA.Mods.Cnc/Traits/MadTank.cs
+++ b/OpenRA.Mods.Cnc/Traits/MadTank.cs
@@ -212,7 +212,8 @@ namespace OpenRA.Mods.Cnc.Traits
 			}
 			else if (order.OrderString == "Detonate")
 			{
-				self.CancelActivity();
+				if (!order.Queued)
+					self.CancelActivity();
 				self.QueueActivity(new CallFunc(StartDetonationSequence));
 			}
 		}