diff --git a/src/Mgr/Travel/TravelMgr.cpp b/src/Mgr/Travel/TravelMgr.cpp
index 4ddba6d46..d6942deab 100644
--- a/src/Mgr/Travel/TravelMgr.cpp
+++ b/src/Mgr/Travel/TravelMgr.cpp
@@ -4764,7 +4764,7 @@ void TravelMgr::PrepareDestinationCache()
         }
     }
     // Add travel hubs based on player start locations
-    for (uint32 i = 1; i < MAX_RACES; i++)
+    for (uint32 i = 1; i < sRaceMgr->GetMaxRaces(); i++)
     {
         for (uint32 j = 1; j < MAX_CLASSES; j++)
         {
@@ -4777,7 +4777,7 @@ void TravelMgr::PrepareDestinationCache()
 
             for (int32 l = 1; l <= 5; l++)
             {
-                if ((1 << (i - 1)) & RACEMASK_ALLIANCE)
+                if ((1 << (i - 1)) & sRaceMgr->GetAllianceRaceMask())
                     allianceHubsPerLevelCache[(uint8)l].push_back(pos);
                 else
                     hordeHubsPerLevelCache[(uint8)l].push_back(pos);