diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index d75e1cf1..b4492a90 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -874,12 +874,9 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
         }
     }
 #endif
-#ifdef DEBUG
-#else
     if (msg->proto_version() < cs::ProtoVersion) {
         msg->set_mapid(2001);
     }
-#endif
 #ifdef DEBUG1
     if (DebugCmd::Enable()) {
         msg->set_room_mode(kPvpRankMode);