diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index ae968b4f..bc75ea72 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -413,6 +413,7 @@ void Room::CreateAndroid(int robot_num)
         hum->SetAttackDir(attack_dir);
         hum->SetMoveDir(attack_dir);
         hum->room = this;
+        hum->join_frameno = GetFrameNo();
         hum->Initialize();
         AddToEntityHash(hum);
         AddToHumanHash(hum);