diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index b0926518..86db889b 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1105,7 +1105,9 @@ bool Room::CanJoin(const std::string& accountid,
                  [this] (int event, const a8::Args* args)
                  {
                      if (a8::TIMER_EXEC_EVENT == event) {
-                         LockRoom();
+                         if (!lock_room_) {
+                             LockRoom();
+                         }
                      }
                  },
                  &xtimer_attacher_);