diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index b1522c939f..1cb0084a1d 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -454,6 +454,9 @@ void WorldSession::HandleBattleGroundPlayerPortOpcode( WorldPacket &recv_data )
                 _player->SetBattleGroundId(bg->GetInstanceID());
                 // set the destination team
                 _player->SetBGTeam(team);
+                // clear AFK
+                if(_player->isAFK())
+                    _player->ToggleAFK();
                 // bg->HandleBeforeTeleportToBattleGround(_player);
                 sBattleGroundMgr.SendToBattleGround(_player, instanceId);
                 // add only in HandleMoveWorldPortAck()