diff --git a/src/http.rs b/src/http.rs
index f44d38946a..2e1671477d 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -331,12 +331,13 @@ fn listen(
         );
         let incoming = listener
             .incoming()
-            .and_then(move |stream| {
+            .map(move |stream| {
                 acceptor.accept(stream).map(Some).or_else(|err| {
                     info!("Unable to accept TLS connection: {}", err);
                     Ok(None)
                 })
             })
+            .buffer_unordered(100)
             .filter_map(|opt_tls_stream| opt_tls_stream);
 
         let future = http