diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index bebdff61..e132a5f5 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1016,6 +1016,13 @@ bool Room::CanJoin(const std::string& accountid,
             return false;
         }
     }
+    if (IsPvpRankModeRoom()) {
+        if (GetGasInactiveReaminTime() < 60) {
+            if (!HaveMyTeam(msg.team_uuid())) {
+                return false;
+            }
+        }
+    }
     if (IsNewBieRoom()) {
         return false;
     }