diff --git a/Source/Game/Achievements/CriteriaHandler.cs b/Source/Game/Achievements/CriteriaHandler.cs
index 62cdb2b9f..b9cdc5ac6 100644
--- a/Source/Game/Achievements/CriteriaHandler.cs
+++ b/Source/Game/Achievements/CriteriaHandler.cs
@@ -3129,7 +3129,7 @@ namespace Game.Achievements
                     break;
                 }
                 case ModifierTreeType.PlayerIsAtMaxExpansionLevel: // 264
-                    if (referencePlayer.GetLevel() != Global.ObjectMgr.GetMaxLevelForExpansion((Expansion)WorldConfig.GetIntValue(WorldCfg.Expansion)))
+                    if (!referencePlayer.IsMaxLevel())
                         return false;
                     break;
                 case ModifierTreeType.TransmogSource: // 265
diff --git a/Source/Game/Entities/Player/Player.Quest.cs b/Source/Game/Entities/Player/Player.Quest.cs
index b59e09b0f..5b6380044 100644
--- a/Source/Game/Entities/Player/Player.Quest.cs
+++ b/Source/Game/Entities/Player/Player.Quest.cs
@@ -1053,7 +1053,7 @@ namespace Game.Entities
             uint XP = GetQuestXPReward(quest);
 
             int moneyRew = 0;
-            if (GetLevel() < WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel))
+            if (!IsMaxLevel())
                 GiveXP(XP, null);
             else
                 moneyRew = (int)(quest.GetRewMoneyMaxLevel() * WorldConfig.GetFloatValue(WorldCfg.RateDropMoney));
@@ -2725,7 +2725,7 @@ namespace Game.Entities
 
             uint moneyReward;
 
-            if (GetLevel() < WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel))
+            if (!IsMaxLevel())
             {
                 moneyReward = GetQuestMoneyReward(quest);
             }
diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index fe472aad8..e6ef3414d 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -5845,7 +5845,12 @@ namespace Game.Entities
 
             PlayerLevelInfo info = Global.ObjectMgr.GetPlayerLevelInfo(GetRace(), GetClass(), GetLevel());
 
-            SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.MaxLevel), WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel));
+            int exp_max_lvl = (int)Global.ObjectMgr.GetMaxLevelForExpansion(GetSession().GetExpansion());
+            int conf_max_lvl = WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel);
+            if (exp_max_lvl == SharedConst.DefaultMaxLevel || exp_max_lvl >= conf_max_lvl)
+                SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.MaxLevel), conf_max_lvl);
+            else
+                SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.MaxLevel), exp_max_lvl);
             SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.NextLevelXP), Global.ObjectMgr.GetXPForLevel(GetLevel()));
             if (m_activePlayerData.XP >= m_activePlayerData.NextLevelXP)
                 SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.XP), m_activePlayerData.NextLevelXP - 1);
@@ -6340,14 +6345,14 @@ namespace Game.Entities
                 var areaLevels = Global.DB2Mgr.GetContentTuningData(areaEntry.ContentTuningID, m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
                 if (areaLevels.HasValue)
                 {
-                    if (GetLevel() >= WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel))
+                    if (IsMaxLevel())
                     {
                         SendExplorationExperience(areaId, 0);
                     }
                     else
                     {
                         ushort areaLevel = (ushort)Math.Min(Math.Max((ushort)GetLevel(), areaLevels.Value.MinLevel), areaLevels.Value.MaxLevel);
-                        int diff = (int)(GetLevel()) - areaLevel;
+                        int diff = (int)GetLevel() - areaLevel;
                         uint XP;
                         if (diff < -5)
                         {
@@ -6635,7 +6640,7 @@ namespace Game.Entities
             Global.ScriptMgr.OnGivePlayerXP(this, xp, victim);
 
             // XP to money conversion processed in Player.RewardQuest
-            if (level >= WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel))
+            if (IsMaxLevel())
                 return;
 
             uint bonus_xp;
@@ -6659,11 +6664,11 @@ namespace Game.Entities
             uint nextLvlXP = GetXPForNextLevel();
             uint newXP = GetXP() + xp + bonus_xp;
 
-            while (newXP >= nextLvlXP && level < WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel))
+            while (newXP >= nextLvlXP && !IsMaxLevel())
             {
                 newXP -= nextLvlXP;
 
-                if (level < WorldConfig.GetIntValue(WorldCfg.MaxPlayerLevel))
+                if (!IsMaxLevel())
                     GiveLevel(level + 1);
 
                 level = GetLevel();