diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index a3afea53a..ec027d683 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -18591,12 +18591,8 @@ bool Player::GetBGAccessByLevel(BattleGroundTypeId bgTypeId) const
 
 BGQueueIdBasedOnLevel Player::GetBattleGroundQueueIdFromLevel(BattleGroundTypeId bgTypeId) const
 {
-    //returned to hardcoded version of this function, because there is no way to code it dynamic
-    uint32 level = getLevel();
-    if( bgTypeId == BATTLEGROUND_AV )
-        level--;
-
-    uint32 queue_id = (level / 10) - 1; // for ranges 0 - 19, 20 - 29, 30 - 39, 40 - 49, 50 - 59, 60 - 69, 70 -79, 80
+    // for ranges 0 - 19, 20 - 29, 30 - 39, 40 - 49, 50 - 59, 60 - 69, 70 - 79, 80
+    uint32 queue_id = ( getLevel() / 10) - 1;
     if( queue_id >= MAX_BATTLEGROUND_QUEUES )
     {
         sLog.outError("BattleGround: too high queue_id %u this shouldn't happen", queue_id);
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 9a6901a19..58ab7c0d0 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -93,7 +93,7 @@ enum Classes
 
 #define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1)))
 
-#define PLAYER_MAX_BATTLEGROUND_QUEUES 3
+#define PLAYER_MAX_BATTLEGROUND_QUEUES 2
 
 enum ReputationRank
 {