diff --git a/rpc/lib/server/handlers.go b/rpc/lib/server/handlers.go
index 0fafd2a8..9de6564d 100644
--- a/rpc/lib/server/handlers.go
+++ b/rpc/lib/server/handlers.go
@@ -488,6 +488,10 @@ func (wsc *wsConnection) readRoutine() {
 		wsc.baseConn.Close()
 	}()
 
+	wsc.baseConn.SetPongHandler(func(m string) error {
+		return wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait))
+	})
+
 	for {
 		select {
 		case <-wsc.Quit: