diff --git a/binaries/data/mods/public/simulation/components/BuildingAI.js b/binaries/data/mods/public/simulation/components/BuildingAI.js
index 93aadd29db..147531cb97 100644
--- a/binaries/data/mods/public/simulation/components/BuildingAI.js
+++ b/binaries/data/mods/public/simulation/components/BuildingAI.js
@@ -86,6 +86,9 @@ BuildingAI.prototype.SetupRangeQuery = function(owner)
  */
 BuildingAI.prototype.OnRangeUpdate = function(msg)
 {
+	if (msg.tag != this.enemyUnitsQuery)
+		return;
+
 	if (msg.added.length > 0)
 	{
 		for each (var entity in msg.added)
@@ -165,4 +168,4 @@ BuildingAI.prototype.FireArrows = function()
 	}
 };
 
-Engine.RegisterComponentType(IID_BuildingAI, "BuildingAI", BuildingAI);
\ No newline at end of file
+Engine.RegisterComponentType(IID_BuildingAI, "BuildingAI", BuildingAI);