diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 6fb0033..8b0bea6 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -177,6 +177,9 @@ void Room::AddPlayer(Player* hum)
     if (gas_data_.gas_mode != GasInactive) {
         abort();
     }
+    while (human_hash_.size() > GetRoomMaxPlayerNum()) {
+        RandRemoveAndroid();
+    }
     hum->born_point = AllocBornPoint(hum);
     if (!hum->born_point) {
         hum->SetPos(GetDefaultBornPoint());
@@ -2657,9 +2660,6 @@ void Room::AddPlayerPostProc(Player* hum)
             }
         }
     }
-    while (human_hash_.size() > GetRoomMaxPlayerNum()) {
-        RandRemoveAndroid();
-    }
     if (GetRoomMode() == kZombieMode) {
         #if 0
         hum->ChangeToRace(kZombieRace, 3);