diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 780c5ea30b..0762ae9f44 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -425,10 +425,15 @@ public class AdminEditChar implements IAdminCommandHandler
 					}
 					
 					// Death Knight sex check.
-					if (player.isDeathKnight())
+					if ((classidval >= 212) && (classidval <= 216))
 					{
+						player.setDeathKnight(true);
 						player.getAppearance().setMale();
 					}
+					else
+					{
+						player.setDeathKnight(false);
+					}
 					
 					final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
 					if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index f84e4ca430..cd0e8ee80f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8707,6 +8707,11 @@ public class PlayerInstance extends Playable
 		return _isDeathKnight;
 	}
 	
+	public void setDeathKnight(boolean value)
+	{
+		_isDeathKnight = value;
+	}
+	
 	public boolean isMounted()
 	{
 		return _mountType != MountType.NONE;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index c8481145dd..fbbdc95f37 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -409,11 +409,17 @@ public class AdminEditChar implements IAdminCommandHandler
 							}
 						}
 					}
+					
 					// Death Knight checks.
-					if (player.isDeathKnight())
+					if ((classidval >= 196) && (classidval <= 207))
 					{
+						player.setDeathKnight(true);
 						player.getAppearance().setMale();
 					}
+					else
+					{
+						player.setDeathKnight(false);
+					}
 					
 					final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
 					// if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5d71cefe73..6eb5cc3e52 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8620,6 +8620,11 @@ public class PlayerInstance extends Playable
 		return _isDeathKnight;
 	}
 	
+	public void setDeathKnight(boolean value)
+	{
+		_isDeathKnight = value;
+	}
+	
 	public boolean isMounted()
 	{
 		return _mountType != MountType.NONE;
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index c8481145dd..fbbdc95f37 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -409,11 +409,17 @@ public class AdminEditChar implements IAdminCommandHandler
 							}
 						}
 					}
+					
 					// Death Knight checks.
-					if (player.isDeathKnight())
+					if ((classidval >= 196) && (classidval <= 207))
 					{
+						player.setDeathKnight(true);
 						player.getAppearance().setMale();
 					}
+					else
+					{
+						player.setDeathKnight(false);
+					}
 					
 					final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
 					// if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5d71cefe73..6eb5cc3e52 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8620,6 +8620,11 @@ public class PlayerInstance extends Playable
 		return _isDeathKnight;
 	}
 	
+	public void setDeathKnight(boolean value)
+	{
+		_isDeathKnight = value;
+	}
+	
 	public boolean isMounted()
 	{
 		return _mountType != MountType.NONE;