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 9078f1d15..0dab89357 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
@@ -595,6 +595,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
     if (!this.explicitlyDisconnected) {
       server.getEventManager().fire(new DisconnectEvent(this, !isConnected))
           .thenRun(() -> this.teardownFuture.complete(null));
+    } else {
+      this.teardownFuture.complete(null);
     }
   }