diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 575a047d9..032e98edc 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7724,7 +7724,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
             pCreature->AI()->EnterCombat(enemy);
 
         // Some bosses are set into combat with zone
-        if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE))
+        if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE) && enemy && enemy->IsControlledByPlayer())
             pCreature->SetInCombatWithZone();
 
         if (InstanceData* mapInstance = GetInstanceData())
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 4e28d3ff5..195b16328 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11068"
+ #define REVISION_NR "11069"
 #endif // __REVISION_NR_H__