diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
index d878b17235..55d1c6634e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.MinionData;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate.Race;
 import org.l2jmobius.gameserver.model.skills.BaseStat;
 import org.l2jmobius.gameserver.model.skills.Stat;
 
@@ -105,18 +106,21 @@ public class NpcTable
 				
 				final int skillId = npcskills.getInt("skillid");
 				final int level = npcskills.getInt("level");
-				if ((npcDat.getRace() == null) && (skillId == 4416))
-				{
-					npcDat.setRace(level);
-					continue;
-				}
-				
 				npcSkill = SkillTable.getInstance().getSkill(skillId, level);
 				if (npcSkill == null)
 				{
 					continue;
 				}
 				
+				if (skillId == 4416)
+				{
+					final Race race = npcDat.getRace();
+					if ((race == null) || (race == Race.UNKNOWN))
+					{
+						npcDat.setRace(level);
+					}
+				}
+				
 				npcDat.addSkill(npcSkill);
 			}
 			
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
index d878b17235..55d1c6634e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.MinionData;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate.Race;
 import org.l2jmobius.gameserver.model.skills.BaseStat;
 import org.l2jmobius.gameserver.model.skills.Stat;
 
@@ -105,18 +106,21 @@ public class NpcTable
 				
 				final int skillId = npcskills.getInt("skillid");
 				final int level = npcskills.getInt("level");
-				if ((npcDat.getRace() == null) && (skillId == 4416))
-				{
-					npcDat.setRace(level);
-					continue;
-				}
-				
 				npcSkill = SkillTable.getInstance().getSkill(skillId, level);
 				if (npcSkill == null)
 				{
 					continue;
 				}
 				
+				if (skillId == 4416)
+				{
+					final Race race = npcDat.getRace();
+					if ((race == null) || (race == Race.UNKNOWN))
+					{
+						npcDat.setRace(level);
+					}
+				}
+				
 				npcDat.addSkill(npcSkill);
 			}