diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
index a3029106..285e5b8f 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
@@ -27,9 +27,6 @@ public class ServerConnection implements Server
     private final boolean forgeServer = false;
     @Getter
     @Setter
-    private boolean pingFailed;
-    @Getter
-    @Setter
     private long sentPingId = -1;
 
     private final Unsafe unsafe = new Unsafe()
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index ad7202d7..bb43810b 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -123,15 +123,6 @@ public class UpstreamBridge extends PacketHandler
             con.setPing( newPing );
         } else
         {
-            if ( con.getServer().getSentPingId() != -1 && !con.getServer().isPingFailed() )
-            {
-                alive.setRandomId( con.getServer().getSentPingId() );
-                con.getServer().unsafe().sendPacket( alive );
-
-                con.getServer().setPingFailed( true );
-                con.getServer().setSentPingId( -1 );
-            }
-
             throw CancelSendSignal.INSTANCE;
         }
     }