diff --git a/src/main/java/io/vertx/core/http/ClientWebSocket.java b/src/main/java/io/vertx/core/http/ClientWebSocket.java
index 942e98f7822..238215fc0ca 100644
--- a/src/main/java/io/vertx/core/http/ClientWebSocket.java
+++ b/src/main/java/io/vertx/core/http/ClientWebSocket.java
@@ -68,6 +68,20 @@ default Future<WebSocket> connect(String requestURI) {
     return connect(new WebSocketConnectOptions().setURI(requestURI));
   }
 
+  @Override
+  ClientWebSocket pause();
+
+  @Override
+  default ClientWebSocket resume() {
+    return (ClientWebSocket) WebSocket.super.resume();
+  }
+
+  @Override
+  ClientWebSocket fetch(long amount);
+
+  @Override
+  ClientWebSocket setWriteQueueMaxSize(int maxSize);
+
   @Override
   ClientWebSocket handler(Handler<Buffer> handler);
 
diff --git a/src/main/java/io/vertx/core/http/ServerWebSocket.java b/src/main/java/io/vertx/core/http/ServerWebSocket.java
index 46f76ae1194..cf7489271dd 100644
--- a/src/main/java/io/vertx/core/http/ServerWebSocket.java
+++ b/src/main/java/io/vertx/core/http/ServerWebSocket.java
@@ -43,7 +43,9 @@ public interface ServerWebSocket extends WebSocket {
   ServerWebSocket pause();
 
   @Override
-  ServerWebSocket resume();
+  default ServerWebSocket resume() {
+    return (ServerWebSocket) WebSocket.super.resume();
+  }
 
   @Override
   ServerWebSocket fetch(long amount);
diff --git a/src/main/java/io/vertx/core/http/WebSocket.java b/src/main/java/io/vertx/core/http/WebSocket.java
index aec8bef31ad..813fa507c34 100644
--- a/src/main/java/io/vertx/core/http/WebSocket.java
+++ b/src/main/java/io/vertx/core/http/WebSocket.java
@@ -39,7 +39,9 @@ public interface WebSocket extends WebSocketBase {
   WebSocket pause();
 
   @Override
-  WebSocket resume();
+  default WebSocket resume() {
+    return fetch(Long.MAX_VALUE);
+  }
 
   @Override
   WebSocket fetch(long amount);
diff --git a/src/main/java/io/vertx/core/http/impl/ClientWebSocketImpl.java b/src/main/java/io/vertx/core/http/impl/ClientWebSocketImpl.java
index e844385173b..697ab53f31c 100644
--- a/src/main/java/io/vertx/core/http/impl/ClientWebSocketImpl.java
+++ b/src/main/java/io/vertx/core/http/impl/ClientWebSocketImpl.java
@@ -75,21 +75,6 @@ public Future<WebSocket> connect(WebSocketConnectOptions options) {
       });
   }
 
-//  @Override
-//  public Future<WebSocket> connect(String host, String requestURI) {
-//    return connect(client.options.getDefaultPort(), host, requestURI);
-//  }
-//
-//  @Override
-//  public Future<WebSocket> connect(String requestURI) {
-//    return connect(client.options.getDefaultPort(), client.options.getDefaultHost(), requestURI);
-//  }
-//
-//  @Override
-//  public Future<WebSocket> connect(String url, MultiMap headers, WebsocketVersion version, List<String> subProtocols) {
-//    return connect(HttpClientImpl.webSocketConnectOptionsAbs(url, headers, version, subProtocols));
-//  }
-
   @Override
   public ClientWebSocket exceptionHandler(Handler<Throwable> handler) {
     exceptionHandler = handler;
@@ -111,19 +96,13 @@ public ClientWebSocket handler(Handler<Buffer> handler) {
   }
 
   @Override
-  public WebSocket pause() {
+  public ClientWebSocket pause() {
     delegate().pause();
     return this;
   }
 
   @Override
-  public WebSocket resume() {
-    delegate().resume();
-    return this;
-  }
-
-  @Override
-  public WebSocket fetch(long amount) {
+  public ClientWebSocket fetch(long amount) {
     delegate().fetch(amount);
     return this;
   }
@@ -139,7 +118,7 @@ public ClientWebSocket endHandler(Handler<Void> handler) {
   }
 
   @Override
-  public WebSocket setWriteQueueMaxSize(int maxSize) {
+  public ClientWebSocket setWriteQueueMaxSize(int maxSize) {
     delegate().setWriteQueueMaxSize(maxSize);
     return this;
   }
diff --git a/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java b/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java
index 872c098fe59..539b8dcf985 100644
--- a/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java
+++ b/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java
@@ -739,12 +739,6 @@ public S pause() {
     return (S) this;
   }
 
-  @Override
-  public S resume() {
-    pending.resume();
-    return (S) this;
-  }
-
   @Override
   public S fetch(long amount) {
     pending.fetch(amount);