diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h
index 6a1f5d1540..10e4457b61 100644
--- a/src/server/game/Miscellaneous/Formulas.h
+++ b/src/server/game/Miscellaneous/Formulas.h
@@ -30,18 +30,22 @@ namespace Trinity
 {
     inline uint32 GetExpansionForLevel(uint32 level)
     {
-        if (level < 60)
+        if (level < 30)
             return EXPANSION_CLASSIC;
-        else if (level < 70)
-            return EXPANSION_THE_BURNING_CRUSADE;
-        else if (level < 80)
-            return EXPANSION_WRATH_OF_THE_LICH_KING;
-        else if (level < 85)
+        else if (level < 35)
             return EXPANSION_CATACLYSM;
-        else if (level < 90)
-            return EXPANSION_MISTS_OF_PANDARIA;
-        else if (level < 100)
+        else if (level < 40)
             return EXPANSION_WARLORDS_OF_DRAENOR;
+        else if (level < 45)
+            return EXPANSION_BATTLE_FOR_AZEROTH;
+        else if (level < 50)
+            return EXPANSION_MISTS_OF_PANDARIA;
+        else if (level < 60)
+            return EXPANSION_SHADOWLANDS;
+        else if (level < 70)
+            return EXPANSION_DRAGONFLIGHT;
+        else if (level < 80)
+            return EXPANSION_THE_WAR_WITHIN;
         else
             return CURRENT_EXPANSION;
     }
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 36c841c707..7af95dfc90 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -98,6 +98,7 @@ enum Expansions
     EXPANSION_SHADOWLANDS              = 8,
     EXPANSION_DRAGONFLIGHT             = 9,
     EXPANSION_THE_WAR_WITHIN           = 10,
+    EXPANSION_MIDNIGHT                 = 11,
     MAX_EXPANSIONS,
 
     MAX_ACCOUNT_EXPANSIONS
@@ -131,6 +132,8 @@ constexpr uint32 GetMaxLevelForExpansion(uint32 expansion)
             return 70;
         case EXPANSION_THE_WAR_WITHIN:
             return 80;
+        case EXPANSION_MIDNIGHT:
+            return 90;
         default:
             break;
     }