diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 192018ee..e09212d1 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3506,5 +3506,5 @@ bool Room::MoveCanReach(const glm::vec3& start, const glm::vec3& end)
 
 bool Room::IsPvpMasterRankModeRoom()
 {
-    return false;
+    return rank_match_conf_ && rank_match_conf_->room_type == RoomType_MasterRank;
 }