diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 5cba0add7..14baa426c 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -5119,7 +5119,8 @@ namespace Game.Entities
                 RemoveAurasDueToSpell(auraOutside);
                 RemoveAurasDueToSpell(auraInside);
                 RemovePlayerFlag(PlayerFlags.WarModeActive);
-                RemovePvpFlag(UnitPVPStateFlags.PvP);
+                if (!HasPlayerFlag(PlayerFlags.InPVP))
+                    RemovePvpFlag(UnitPVPStateFlags.PvP);
                 RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave);
             }
         }