diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java
index c5eb9d8d6..119e03785 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java
@@ -83,6 +83,13 @@ public class TransitionSessionHandler implements MinecraftSessionHandler {
         .fire(new ServerConnectedEvent(serverConn.getPlayer(), serverConn.getServer(),
             existingConnection != null ? existingConnection.getServer() : null))
         .whenCompleteAsync((x, error) -> {
+          // Make sure we can still transition (player might have disconnected here).
+          if (!serverConn.isActive()) {
+            // Connection is obsolete.
+            serverConn.disconnect();
+            return;
+          }
+
           // Strap on the ClientPlaySessionHandler if required.
           ClientPlaySessionHandler playHandler;
           if (serverConn.getPlayer().getConnection().getSessionHandler()