diff --git a/client-websocket/src/main/java/com/github/twitch4j/client/websocket/WebsocketConnection.java b/client-websocket/src/main/java/com/github/twitch4j/client/websocket/WebsocketConnection.java
index ce0501276..9512d9fb7 100644
--- a/client-websocket/src/main/java/com/github/twitch4j/client/websocket/WebsocketConnection.java
+++ b/client-websocket/src/main/java/com/github/twitch4j/client/websocket/WebsocketConnection.java
@@ -283,11 +283,16 @@ public void close() throws Exception {
 
     @Synchronized
     private void closeSocket() {
+        // Clean up the socket
         if (webSocket != null) {
             this.webSocket.disconnect();
             this.webSocket.clearListeners();
             this.webSocket = null;
         }
+
+        // Reset latency tracker
+        this.latency = -1L;
+        lastPing.lazySet(0L);
     }
 
 }