diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 452b52dd1..f69e88da5 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -2395,7 +2395,7 @@ namespace Game.Entities
                 // 3 ShapeshiftForm     Must be determined/set by shapeshift spell/aura
 
                 SetSheath((SheathState)(cainfo.bytes2 & 0xFF));
-                ReplaceAllPvpFlags(UnitPVPStateFlags.None);
+                ReplaceAllPvpFlags((UnitPVPStateFlags)((cainfo.bytes2 >> 8) & 0xFF));
                 ReplaceAllPetFlags(UnitPetFlags.None);
                 SetShapeshiftForm(ShapeShiftForm.None);
             }