diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java
index 5bb5873c90..6fc026ff15 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java
@@ -54,6 +54,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
             }
             if (!HttpResponseStatus.CONTINUE.equals(response.status())) {
                 ctx.fireChannelRead(msg); //bypass the message to the next handler in line
+            } else {
+                ctx.pipeline().remove(this);
             }
         } else {
             if (!isExpected) {
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index 87227fbc30..0821aca265 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -2041,9 +2041,9 @@
                         <entry><literal>jersey.config.client.request.expect.100.continue.timeout</literal></entry>
                         <entry>
                             <para>
-                                Property for expect:100-continue timeout value which shall be waited until the full
-                                request is sent ignoring Expect:100-continue feature.
-                                Default timeout value is (500 ms) after which Expect:100-Continue feature is ignored.
+                                This timeout is used for waiting for 100-Continue response when 100-Continue
+                                is sent by the client.
+                                Default timeout value is 500 ms after which Expect:100-Continue feature is ignored.
                                 <literal>Since 2.41</literal>
                             </para>
                         </entry>