diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs
index c1d6996e7..1c2a900c9 100644
--- a/Source/Game/AI/CoreAI/CreatureAI.cs
+++ b/Source/Game/AI/CoreAI/CreatureAI.cs
@@ -55,11 +55,10 @@ namespace Game.AI
             base.OnCharmed(isNew);
         }
 
-        public void DoZoneInCombat(Creature creature = null)
-        {
-            if (!creature)
-                creature = me;
+        public void DoZoneInCombat() { DoZoneInCombat(me); }
 
+        public static void DoZoneInCombat(Creature creature)
+        {
             Map map = creature.GetMap();
             if (!map.IsDungeon()) // use IsDungeon instead of Instanceable, in case Battlegrounds will be instantiated
             {
diff --git a/Source/Game/AI/ScriptedAI/ScriptedAI.cs b/Source/Game/AI/ScriptedAI/ScriptedAI.cs
index 7d745422f..f763d06cd 100644
--- a/Source/Game/AI/ScriptedAI/ScriptedAI.cs
+++ b/Source/Game/AI/ScriptedAI/ScriptedAI.cs
@@ -771,7 +771,7 @@ namespace Game.AI
                 Creature summon = ObjectAccessor.GetCreature(_me, id);
                 if (summon && summon.IsAIEnabled() && (entry == 0 || summon.GetEntry() == entry))
                 {
-                    summon.GetAI().DoZoneInCombat(null);
+                    summon.GetAI().DoZoneInCombat();
                 }
             }
         }