diff --git a/Package.swift b/Package.swift
index a68614687df..931bc28161d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -301,7 +301,8 @@ let package = Package(
                 "NIOCore",
                 "NIOConcurrencyHelpers",
             ],
-            exclude: ["README.md"]
+            exclude: ["README.md"],
+            swiftSettings: strictConcurrencySettings
         ),
         .executableTarget(
             name: "NIOHTTP1Server",
diff --git a/Sources/NIOEchoClient/main.swift b/Sources/NIOEchoClient/main.swift
index d7de8eb35b0..e92ebc02ffb 100644
--- a/Sources/NIOEchoClient/main.swift
+++ b/Sources/NIOEchoClient/main.swift
@@ -58,7 +58,9 @@ let bootstrap = ClientBootstrap(group: group)
     // Enable SO_REUSEADDR.
     .channelOption(.socketOption(.so_reuseaddr), value: 1)
     .channelInitializer { channel in
-        channel.pipeline.addHandler(EchoHandler())
+        channel.eventLoop.makeCompletedFuture {
+            try channel.pipeline.syncOperations.addHandler(EchoHandler())
+        }
     }
 defer {
     try! group.syncShutdownGracefully()