diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index 0945b9dda4..22902f85e1 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -161,6 +161,16 @@ UnitAI.prototype.UnitFsmSpec = {
 
 	// Default event handlers:
 
+	"MovementUpdate": function(msg) {
+		// ignore spurious movement messages
+		// (these can happen when stopping moving at the same time
+		// as switching states)
+	},
+
+	"ConstructionFinished": function(msg) {
+		// ignore uninteresting construction messages
+	},
+
 	"LosRangeUpdate": function(msg) {
 		// Ignore newly-seen units by default.
 	},
@@ -181,10 +191,18 @@ UnitAI.prototype.UnitFsmSpec = {
 		// ignore
 	},
 
+	"PackFinished": function(msg) {
+		// ignore
+	},
+
 	"PickupCanceled": function(msg) {
 		// ignore
 	},
 
+	"TradingCanceled": function(msg) {
+		// ignore
+	},
+
 	"GuardedAttacked": function(msg) {
 		// ignore
 	},