diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift
index 9a3e11b50..e0f76cbb1 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift
@@ -30,6 +30,7 @@ extension HTTPClientInternalTests {
             ("testHostPort", testHostPort),
             ("testHTTPPartsHandlerMultiBody", testHTTPPartsHandlerMultiBody),
             ("testProxyStreaming", testProxyStreaming),
+            ("testProxyStreamingNoDeadlock", testProxyStreamingNoDeadlock),
             ("testProxyStreamingFailure", testProxyStreamingFailure),
             ("testUploadStreamingBackpressure", testUploadStreamingBackpressure),
             ("testRequestURITrailingSlash", testRequestURITrailingSlash),
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
index e5a6ad411..737fc84e2 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
@@ -190,6 +190,40 @@ class HTTPClientInternalTests: XCTestCase {
         XCTAssertEqual("id: 0id: 1id: 2id: 3id: 4id: 5id: 6id: 7id: 8id: 9", data?.data)
     }
 
+    func testProxyStreamingNoDeadlock() throws {
+        let httpBin = HTTPBin()
+        let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
+        defer {
+            XCTAssertNoThrow(try httpClient.syncShutdown(requiresCleanClose: true))
+            XCTAssertNoThrow(try httpBin.shutdown())
+        }
+
+        let goSignalPromise = httpClient.eventLoopGroup.next().makePromise(of: Void.self)
+        let goSignal = goSignalPromise.futureResult
+
+        let body: HTTPClient.Body = .stream(length: 50) { writer in
+            goSignal.flatMap {
+                httpClient.get(url: "http://localhost:\(httpBin.port)/get")
+            }.flatMap { _ in
+                writer.write(IOData.byteBuffer(.of(bytes: .init(repeating: 0, count: 50))))
+            }
+        }
+
+        var allRequests = [EventLoopFuture<HTTPClient.Response>]()
+
+        // Make sure to exceed maximum number of concurrent connections
+        for _ in 1...50 {
+            allRequests.append(httpClient.post(url: "http://localhost:\(httpBin.port)/post", body: body))
+        }
+
+        // Now allow requests to actually send their body data
+        goSignalPromise.succeed(())
+
+        let everythingSucceeded = EventLoopFuture<HTTPClient.Response>.andAllSucceed(allRequests, on: httpClient.eventLoopGroup.next())
+
+        XCTAssertNoThrow(try everythingSucceeded.timeout(after: .seconds(5)).wait())
+    }
+
     func testProxyStreamingFailure() throws {
         let httpBin = HTTPBin()
         let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))