diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 3cc0d9aed..aeffe3c16 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -4748,6 +4748,7 @@ namespace Game.Entities
                     RemovePlayerFlag(PlayerFlags.WarModeActive);
                     CastSpell(this, auraInside, true);
                     RemoveAurasDueToSpell(auraOutside);
+                    RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave);
                 }
                 else
                 {
@@ -4765,6 +4766,7 @@ namespace Game.Entities
                 RemoveAurasDueToSpell(auraInside);
                 RemovePlayerFlag(PlayerFlags.WarModeActive);
                 RemovePvpFlag(UnitPVPStateFlags.PvP);
+                RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave);
             }
         }
 
diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs
index aefd03b00..3e87a2fab 100644
--- a/Source/Game/Entities/Unit/Unit.cs
+++ b/Source/Game/Entities/Unit/Unit.cs
@@ -591,7 +591,7 @@ namespace Game.Entities
                 Unit.ProcSkillsAndAuras(this, null, new ProcFlagsInit(ProcFlags.EncounterStart), new ProcFlagsInit(), ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.None, ProcFlagsHit.None, null, null, null);
         }
 
-        void AtEndOfEncounter()
+        public void AtEndOfEncounter()
         {
             RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.EndOfEncounter);
         }