diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index a25c718f..0d660fa9 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -4122,9 +4122,8 @@ void Room::AddTeam(class MatchTeam* team)
                 hum->meta = MetaMgr::Instance()->human_meta;
             }
             hum->room = this;
-            AddPlayer(hum, init_born_point, true);
-
             hum->SetBattleContext(member->battle_context);
+            AddPlayer(hum, init_born_point, true);
             hum->GetBattleContext()->Init(hum);
             hum->ProcSkillList();
             hum->SetHP(hum->GetBattleContext()->GetMaxHP());
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 6dca9d0b..6c0b052a 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -205,8 +205,8 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
                 hum->meta = MetaMgr::Instance()->human_meta;
             }
             hum->room = room;
-            room->AddPlayer(hum);
             hum->SetBattleContext(results.at(0));
+            room->AddPlayer(hum);
             hum->GetBattleContext()->Init(hum);
             hum->ProcSkillList();
             hum->SetHP(hum->GetBattleContext()->GetMaxHP());