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 19f519591..4c5954cf6 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
@@ -772,6 +772,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
               } else if (status.getStatus() == Status.SERVER_DISCONNECTED) {
                 resetInFlightConnection();
               }
+            } else if (throwable != null) {
+              resetInFlightConnection();
             }
           }, connection.eventLoop())
           .thenApply(x -> x);