diff --git a/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java b/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java index 9f84ada7ab..dddebfff41 100755 --- a/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java +++ b/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java @@ -366,7 +366,10 @@ public TimeoutsHolder getTimeoutsHolder() { } public void setTimeoutsHolder(TimeoutsHolder timeoutsHolder) { - TIMEOUTS_HOLDER_FIELD.set(this, timeoutsHolder); + TimeoutsHolder ref = TIMEOUTS_HOLDER_FIELD.getAndSet(this, timeoutsHolder); + if (ref != null) { + ref.cancel(); + } } public boolean isInAuth() {