diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 3d122995..12f168ba 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1433,6 +1433,7 @@ void Room::UpdateGasInactivePvp()
         ClearPostBattleAutoFreeList();
         OnBattleStart();
         InitAndroidAI();
+        RoomMgr::Instance()->ActiveRoom(GetRoomUuid());
         if (IsSandTableRoom()) {
             {
                 const mt::SafeArea* first_safearea = mt::SafeArea::GetByType
@@ -1488,7 +1489,6 @@ void Room::UpdateGasInactivePvp()
             }
         } else {
             if (IsNoPlane()) {
-                RoomMgr::Instance()->ActiveRoom(GetRoomUuid());
                 {
                     const mt::SafeArea* first_safearea = mt::SafeArea::GetByType
                         (map_meta_->RandSafeArea());
@@ -1543,7 +1543,6 @@ void Room::UpdateGasInactivePvp()
                 }
             } else {
                 ShuaPlane();
-                RoomMgr::Instance()->ActiveRoom(GetRoomUuid());
 #if 1
                 int auto_jump_interval = mt::Param::GetIntParam("auto_jump_interval");
                 auto_jump_timer_ = xtimer.SetIntervalWpEx