diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 68ecfd472d..8cd479364a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2676,13 +2676,14 @@ public final class L2PcInstance extends L2Playable
 	@Override
 	public Race getRace()
 	{
+		final ClassId originalClass = getOriginalClass();
+		if (originalClass != null)
+		{
+			return originalClass.getRace();
+		}
+		
 		if (!isSubClassActive())
 		{
-			final ClassId originalClass = getOriginalClass();
-			if (originalClass != null)
-			{
-				return originalClass.getRace();
-			}
 			return getTemplate().getRace();
 		}
 		return PlayerTemplateData.getInstance().getTemplate(_baseClass).getRace();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index dc7235c5a7..0ba6ea0a92 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2676,13 +2676,14 @@ public final class L2PcInstance extends L2Playable
 	@Override
 	public Race getRace()
 	{
+		final ClassId originalClass = getOriginalClass();
+		if (originalClass != null)
+		{
+			return originalClass.getRace();
+		}
+		
 		if (!isSubClassActive())
 		{
-			final ClassId originalClass = getOriginalClass();
-			if (originalClass != null)
-			{
-				return originalClass.getRace();
-			}
 			return getTemplate().getRace();
 		}
 		return PlayerTemplateData.getInstance().getTemplate(_baseClass).getRace();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index b57c5c6adf..59c535aff4 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2679,13 +2679,14 @@ public final class L2PcInstance extends L2Playable
 	@Override
 	public Race getRace()
 	{
+		final ClassId originalClass = getOriginalClass();
+		if (originalClass != null)
+		{
+			return originalClass.getRace();
+		}
+		
 		if (!isSubClassActive())
 		{
-			final ClassId originalClass = getOriginalClass();
-			if (originalClass != null)
-			{
-				return originalClass.getRace();
-			}
 			return getTemplate().getRace();
 		}
 		return PlayerTemplateData.getInstance().getTemplate(_baseClass).getRace();