diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 543438a2..13ae2210 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1009,9 +1009,12 @@ bool Room::CanJoin(const std::string& accountid,
 {
     if (lock_room_) {
         if (IsPvpRankModeRoom()) {
-
+            if (!HaveMyTeam(msg.team_uuid())) {
+                return false;
+            }
+        } else {
+            return false;
         }
-        return false;
     }
     if (IsNewBieRoom()) {
         return false;