diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs
index 4174b55ea..66ebd3850 100644
--- a/Source/Game/Globals/ObjectManager.cs
+++ b/Source/Game/Globals/ObjectManager.cs
@@ -6487,7 +6487,10 @@ namespace Game
                         if (WorldConfig.GetIntValue(WorldCfg.Expansion) < (int)Expansion.Legion && _class == Class.DemonHunter)
                             continue;
 
-                        if (WorldConfig.GetIntValue(WorldCfg.Expansion) < (int)Expansion.Dragonflight && _class == Class.Evoker)
+                        if (WorldConfig.GetIntValue(WorldCfg.Expansion) < (int)Expansion.Dragonflight && (_class == Class.Evoker || race == Race.DracthyrAlliance || race == Race.DracthyrHorde))
+                            continue;
+
+                        if (WorldConfig.GetIntValue(WorldCfg.Expansion) < (int)Expansion.TheWarWithin && (race == Race.EarthenDwarfHorde || race == Race.EarthenDwarfAlliance))
                             continue;
 
                         // fatal error if no level 1 data
diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs
index 36428230b..2f24420f0 100644
--- a/Source/Game/Handlers/CharacterHandler.cs
+++ b/Source/Game/Handlers/CharacterHandler.cs
@@ -1943,6 +1943,7 @@ namespace Game
                         case Race.Vulpera:
                             stmt.AddValue(1, 2776);
                             break;
+                        case Race.PandarenNeutral:
                         case Race.PandarenAlliance:
                         case Race.PandarenHorde:
                             stmt.AddValue(1, 905);
@@ -1951,6 +1952,10 @@ namespace Game
                         case Race.DracthyrHorde:
                             stmt.AddValue(1, 138);
                             break;
+                        case Race.EarthenDwarfHorde:
+                        case Race.EarthenDwarfAlliance:
+                            stmt.AddValue(1, 140);
+                            break;
                         default:
                             Log.outError(LogFilter.Player, $"Could not find language data for race ({factionChangeInfo.RaceID}).");
                             SendCharFactionChange(ResponseCodes.CharCreateError, factionChangeInfo);