diff --git a/src/main/java/net/minestom/server/entity/EntityManager.java b/src/main/java/net/minestom/server/entity/EntityManager.java
index cf6226d82..fe051837b 100644
--- a/src/main/java/net/minestom/server/entity/EntityManager.java
+++ b/src/main/java/net/minestom/server/entity/EntityManager.java
@@ -4,6 +4,7 @@ import com.google.common.collect.Queues;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.chat.ChatColor;
 import net.minestom.server.chat.ColoredText;
+import net.minestom.server.entity.fakeplayer.FakePlayerOption;
 import net.minestom.server.event.player.AsyncPlayerPreLoginEvent;
 import net.minestom.server.event.player.PlayerLoginEvent;
 import net.minestom.server.instance.Instance;
@@ -79,9 +80,10 @@ public final class EntityManager {
      * If the {@link Player} hasn't been kicked, add him to the waiting list.
      * <p>
      * Can be considered as a pre-init thing,
-     * currently executed in {@link Player#Player(UUID, String, PlayerConnection)}.
+     * currently executed in {@link ConnectionManager#createPlayer(UUID, String, PlayerConnection)}
+     * and {@link net.minestom.server.entity.fakeplayer.FakePlayer#initPlayer(UUID, String, FakePlayerOption, Consumer)}.
      *
-     * @param player the {@link Player} to add
+     * @param player the {@link Player player} to add to the waiting list
      */
     public void addWaitingPlayer(@NotNull Player player) {
 
diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java
index 4212f60a7..f1e348b73 100644
--- a/src/main/java/net/minestom/server/entity/Player.java
+++ b/src/main/java/net/minestom/server/entity/Player.java
@@ -220,8 +220,6 @@ public class Player extends LivingEntity implements CommandSender {
 
         // FakePlayer init its connection there
         playerConnectionInit();
-
-        MinecraftServer.getEntityManager().addWaitingPlayer(this);
     }
 
     /**
diff --git a/src/main/java/net/minestom/server/entity/fakeplayer/FakePlayer.java b/src/main/java/net/minestom/server/entity/fakeplayer/FakePlayer.java
index a003e5da5..fcbc0b471 100644
--- a/src/main/java/net/minestom/server/entity/fakeplayer/FakePlayer.java
+++ b/src/main/java/net/minestom/server/entity/fakeplayer/FakePlayer.java
@@ -63,6 +63,8 @@ public class FakePlayer extends Player {
                         }
                     });
         }
+
+        MinecraftServer.getEntityManager().addWaitingPlayer(fakePlayer);
     }
 
     /**
diff --git a/src/main/java/net/minestom/server/network/ConnectionManager.java b/src/main/java/net/minestom/server/network/ConnectionManager.java
index 6560eb052..8eb63839e 100644
--- a/src/main/java/net/minestom/server/network/ConnectionManager.java
+++ b/src/main/java/net/minestom/server/network/ConnectionManager.java
@@ -334,6 +334,7 @@ public final class ConnectionManager {
     public Player createPlayer(@NotNull UUID uuid, @NotNull String username, @NotNull PlayerConnection connection) {
         final Player player = getPlayerProvider().createPlayer(uuid, username, connection);
         createPlayer(player);
+        MinecraftServer.getEntityManager().addWaitingPlayer(player);
         return player;
     }