diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
index f8ff4f6f7d..eaaeefa92c 100644
--- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
+++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
@@ -47,29 +47,14 @@ public final class ExEnchantSkillInfo implements IClientOutgoingPacket
 		OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet);
 		
 		packet.writeD(_skillId);
-		if (_skillSubLevel > 1000)
-		{
-			packet.writeD(SkillEnchantConverter.levelToErtheia(_skillSubLevel));
-		}
-		else
-		{
-			packet.writeD(_skillLevel);
-		}
+		packet.writeD(_skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(_skillSubLevel) : _skillLevel);
 		packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1);
 		packet.writeD(_skillSubLevel > 1000 ? 1 : 0);
 		packet.writeD(_routes.size());
 		_routes.forEach(route ->
 		{
 			int subLevel = (_currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route);
-			if (subLevel > 1000)
-			{
-				subLevel = SkillEnchantConverter.levelToErtheia(subLevel);
-			}
-			// Skip a level?
-			// final int routeId = route / 1000;
-			// final int currentRouteId = _skillSubLevel / 1000;
-			// packet.writeD(currentRouteId != routeId ? subLevel : subLevel + 1);
-			packet.writeD(subLevel);
+			packet.writeD(subLevel > 1000 ? SkillEnchantConverter.levelToErtheia(subLevel) : subLevel);
 		});
 		return true;
 	}
diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java
index abc94c6906..bf5a624d55 100644
--- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java
+++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java
@@ -71,14 +71,7 @@ public final class SkillList implements IClientOutgoingPacket
 		for (Skill temp : _skills)
 		{
 			packet.writeD(temp.passive ? 1 : 0);
-			if (temp.subLevel > 1000)
-			{
-				packet.writeD(SkillEnchantConverter.levelToErtheia(temp.subLevel));
-			}
-			else
-			{
-				packet.writeD(temp.level);
-			}
+			packet.writeD(temp.subLevel > 1000 ? SkillEnchantConverter.levelToErtheia(temp.subLevel) : temp.level);
 			packet.writeD(temp.id);
 			packet.writeD(temp.reuseDelayGroup); // GOD ReuseDelayShareGroupID
 			packet.writeC(temp.disabled ? 1 : 0); // iSkillDisabled