diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 836d85c88..e87b48abb 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -622,7 +622,7 @@ namespace Game.Entities
 
                             Unit target;
                             // @todo this hack with search required until GO casting not implemented
-                            if (GetOwner() != null)
+                            if (GetOwner() != null || goInfo.Trap.Checkallunits != 0)
                             {
                                 // Hunter trap: Search units which are unfriendly to the trap's owner
                                 var checker = new NearestAttackableNoTotemUnitInObjectRangeCheck(this, radius);