diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index be2b7355..8fce4cce 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -828,10 +828,9 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
     msg->set_force_enter_newbie_room(false);
     msg->set_pve_instance_id(0);
 #ifdef DEBUG
-    if (!f8::IsTestEnv()) {
-        if (App::Instance()->instance_id == 6) {
-            msg->set_room_mode(kMobaMode);
-        }
+    const mt::Map* map_meta = mt::Map::GetById(msg->mapid());
+    if (map_meta && map_meta->is_moba()) {
+        msg->set_room_mode(kMobaMode);
         return;
     }
 #endif