diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
index c53fd81db5..11d8db5ca4 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
@@ -167,6 +167,11 @@ public class CharSelectInfoPackage
 		{
 			_baseClassId = 204;
 		}
+		// Vanguard
+		else if ((baseClassId >= 217) && (baseClassId <= 220))
+		{
+			_baseClassId = 217;
+		}
 		// Other Classes
 		else
 		{