diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index 74c4d14ab..ac4fb112b 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -47,6 +47,7 @@ import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
 import com.nukkitx.protocol.bedrock.packet.TextPacket;
 import lombok.Getter;
 import lombok.Setter;
+import org.geysermc.api.Geyser;
 import org.geysermc.api.Player;
 import org.geysermc.api.RemoteServer;
 import org.geysermc.api.session.AuthData;
@@ -126,6 +127,7 @@ public class GeyserSession implements PlayerSession, Player {
 
     public void authenticate(String username) {
         authenticate(username, "");
+        Geyser.addPlayer(this);
     }
 
     public void authenticate(String username, String password) {
@@ -204,6 +206,7 @@ public class GeyserSession implements PlayerSession, Player {
     @Override
     public void onDisconnect(String reason) {
         downstream.getSession().disconnect("Disconnected from server. Reason: " + reason);
+        Geyser.removePlayer(this);
     }
 
     public void setAuthenticationData(AuthData authData) {