diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
index 5d078a0cfc4..58a0d46a6dc 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
@@ -24,6 +24,7 @@
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpContentDecompressor;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpRequestEncoder;
 import io.netty.handler.codec.http.HttpResponseDecoder;
@@ -147,6 +148,7 @@ public ChannelFuture handshake(Channel channel) {
      */
     public final ChannelFuture handshake(Channel channel, final ChannelPromise promise) {
         FullHttpRequest request =  newHandshakeRequest();
+
         HttpResponseDecoder decoder = channel.pipeline().get(HttpResponseDecoder.class);
         if (decoder == null) {
             HttpClientCodec codec = channel.pipeline().get(HttpClientCodec.class);
@@ -203,6 +205,12 @@ public final void finishHandshake(Channel channel, FullHttpResponse response) {
         setHandshakeComplete();
 
         ChannelPipeline p = channel.pipeline();
+        // Remove decompressor from pipeline if its in use
+        HttpContentDecompressor decompressor = p.get(HttpContentDecompressor.class);
+        if (decompressor != null) {
+            p.remove(decompressor);
+        }
+
         ChannelHandlerContext ctx = p.context(HttpResponseDecoder.class);
         if (ctx == null) {
             ctx = p.context(HttpClientCodec.class);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
index e144258f092..f57ba7a03e9 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
@@ -23,6 +23,7 @@
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContentCompressor;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpRequestDecoder;
@@ -166,6 +167,9 @@ public void operationComplete(ChannelFuture future) throws Exception {
                     if (p.get(HttpObjectAggregator.class) != null) {
                         p.remove(HttpObjectAggregator.class);
                     }
+                    if (p.get(HttpContentCompressor.class) != null) {
+                        p.remove(HttpContentCompressor.class);
+                    }
                     ChannelHandlerContext ctx = p.context(HttpRequestDecoder.class);
                     if (ctx == null) {
                         // this means the user use a HttpServerCodec