diff --git a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
index e0f250f9a..52a850e53 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
@@ -291,10 +291,9 @@ public class VelocityServer implements ProxyServer {
     return true;
   }
 
-  public boolean unregisterConnection(ConnectedPlayer connection) {
-    boolean name = connectionsByName.remove(connection.getUsername().toLowerCase(Locale.US), connection);
-    boolean uuid = connectionsByUuid.remove(connection.getUniqueId(), connection);
-    return name && uuid;
+  public void unregisterConnection(ConnectedPlayer connection) {
+    connectionsByName.remove(connection.getUsername().toLowerCase(Locale.US), connection);
+    connectionsByUuid.remove(connection.getUniqueId(), connection);
   }
 
   @Override
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
index d76070057..e06cdacfa 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -432,9 +432,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
     if (connectedServer != null) {
       connectedServer.disconnect();
     }
-    if (server.unregisterConnection(this)) {
-      server.getEventManager().fireAndForget(new DisconnectEvent(this));
-    }
+    server.unregisterConnection(this);
+    server.getEventManager().fireAndForget(new DisconnectEvent(this));
   }
 
   @Override