diff --git a/Sources/AsyncHTTPClient/HTTPHandler.swift b/Sources/AsyncHTTPClient/HTTPHandler.swift
index 6adb55342..721874da8 100644
--- a/Sources/AsyncHTTPClient/HTTPHandler.swift
+++ b/Sources/AsyncHTTPClient/HTTPHandler.swift
@@ -767,9 +767,10 @@ extension TaskHandler: ChannelDuplexHandler {
 
         return body.stream(HTTPClient.Body.StreamWriter { part in
             context.eventLoop.assertInEventLoop()
-            return context.writeAndFlush(self.wrapOutboundOut(.body(part))).map {
+            context.write(self.wrapOutboundOut(.body(part))).whenSuccess {
                 self.callOutToDelegateFireAndForget(value: part, self.delegate.didSendRequestPart)
             }
+            return context.eventLoop.makeSucceededFuture(())
         })
     }