diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 9c70da28e..d40078c5a 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -1099,6 +1099,10 @@ void BattleGround::StartBattleGround()
 
 void BattleGround::AddPlayer(Player *plr)
 {
+    // remove afk from player
+    if (plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK))
+        plr->ToggleAFK();
+
     // score struct must be created in inherited class
 
     uint64 guid = plr->GetGUID();
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f56684e1e..908fbe872 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8426"
+ #define REVISION_NR "8427"
 #endif // __REVISION_NR_H__