diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index c496247ebd7..bde5f00f8c0 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -44,7 +44,7 @@ enum LevelLimit
     // Client expected level limitation, like as used in DBC item max levels for "until max player level"
     // use as default max player level, must be fit max level for used client
     // also see MAX_LEVEL and STRONG_MAX_LEVEL define
-    DEFAULT_MAX_LEVEL = 70,
+    DEFAULT_MAX_LEVEL = 80,
 
     // client supported max level for player/pets/etc. Avoid overflow or client stability affected.
     // also see GT_MAX_LEVEL define
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 74c4f5f526c..73c902986da 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -109,25 +109,18 @@ constexpr uint32 GetMaxLevelForExpansion(uint32 expansion)
     switch (expansion)
     {
         case EXPANSION_CLASSIC:
-            return 30;
-        case EXPANSION_THE_BURNING_CRUSADE:
-            return 30;
-        case EXPANSION_WRATH_OF_THE_LICH_KING:
-            return 30;
-        case EXPANSION_CATACLYSM:
-            return 35;
-        case EXPANSION_MISTS_OF_PANDARIA:
-            return 35;
-        case EXPANSION_WARLORDS_OF_DRAENOR:
-            return 40;
-        case EXPANSION_LEGION:
-            return 45;
-        case EXPANSION_BATTLE_FOR_AZEROTH:
-            return 50;
-        case EXPANSION_SHADOWLANDS:
             return 60;
-        case EXPANSION_DRAGONFLIGHT:
+        case EXPANSION_THE_BURNING_CRUSADE:
             return 70;
+        case EXPANSION_WRATH_OF_THE_LICH_KING:
+        case EXPANSION_CATACLYSM: // since we do support retail accounts, we will make all newer expansions follow the support max level
+        case EXPANSION_MISTS_OF_PANDARIA:
+        case EXPANSION_WARLORDS_OF_DRAENOR:
+        case EXPANSION_LEGION:
+        case EXPANSION_BATTLE_FOR_AZEROTH:
+        case EXPANSION_SHADOWLANDS:
+        case EXPANSION_DRAGONFLIGHT:
+            return 80;
         default:
             break;
     }
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index a0ffd35e432..28cfc6adba8 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -897,9 +897,9 @@ SkipCinematics = 0
 #        Description: Maximum level that can be reached by players.
 #        Important:   Levels beyond 110 are not recommended at all.
 #        Range:       1-255
-#        Default:     70
+#        Default:     80
 
-MaxPlayerLevel = 70
+MaxPlayerLevel = 80
 
 #
 #    MinDualSpecLevel