diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7487423b8..40f1db578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Improve error message on TLS version mismatch (@mhils)
 * Windows: Switch to Python's default asyncio event loop, which increases the number of sockets
   that can be processed simultaneously (@mhils)
+* Add `client_replay_concurrency` option, which allows more than one client replay request to be in-flight at a time. (@rbdixon)
 
 ## 28 September 2021: mitmproxy 7.0.4
 
diff --git a/mitmproxy/addons/clientplayback.py b/mitmproxy/addons/clientplayback.py
index bfd8a1bd1..b75034933 100644
--- a/mitmproxy/addons/clientplayback.py
+++ b/mitmproxy/addons/clientplayback.py
@@ -133,7 +133,10 @@ class ClientPlayback:
             self.inflight = await self.queue.get()
             try:
                 h = ReplayHandler(self.inflight, self.options)
-                await h.replay()
+                if ctx.options.client_replay_concurrency == -1:
+                    asyncio_utils.create_task(h.replay(), name="client playback awaiting response")
+                else:
+                    await h.replay()
             except Exception:
                 ctx.log(f"Client replay has crashed!\n{traceback.format_exc()}", "error")
             self.queue.task_done()
@@ -160,6 +163,10 @@ class ClientPlayback:
             "client_replay", typing.Sequence[str], [],
             "Replay client requests from a saved file."
         )
+        loader.add_option(
+            "client_replay_concurrency", int, 1,
+            "Concurrency limit on in-flight client replay requests. Currently the only valid values are 1 and -1 (no limit)."
+        )
 
     def configure(self, updated):
         if "client_replay" in updated and ctx.options.client_replay:
@@ -169,6 +176,10 @@ class ClientPlayback:
                 raise exceptions.OptionsError(str(e))
             self.start_replay(flows)
 
+        if "client_replay_concurrency" in updated:
+            if ctx.options.client_replay_concurrency not in [-1, 1]:
+                raise exceptions.OptionsError("Currently the only valid client_replay_concurrency values are -1 and 1.")
+
     @command.command("replay.client.count")
     def count(self) -> int:
         """
diff --git a/test/mitmproxy/addons/test_clientplayback.py b/test/mitmproxy/addons/test_clientplayback.py
index 4e152c4b6..ad68c1d26 100644
--- a/test/mitmproxy/addons/test_clientplayback.py
+++ b/test/mitmproxy/addons/test_clientplayback.py
@@ -22,7 +22,8 @@ async def tcp_server(handle_conn) -> Address:
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("mode", ["regular", "upstream", "err"])
-async def test_playback(mode):
+@pytest.mark.parametrize("concurrency", [-1, 1])
+async def test_playback(mode, concurrency):
     handler_ok = asyncio.Event()
 
     async def handler(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
@@ -50,6 +51,7 @@ async def test_playback(mode):
     cp = ClientPlayback()
     ps = Proxyserver()
     with taddons.context(cp, ps) as tctx:
+        tctx.configure(cp, client_replay_concurrency=concurrency)
         async with tcp_server(handler) as addr:
 
             cp.running()
@@ -140,3 +142,6 @@ def test_configure(tdata):
         tctx.configure(cp, client_replay=[])
         with pytest.raises(OptionsError):
             tctx.configure(cp, client_replay=["nonexistent"])
+        tctx.configure(cp, client_replay_concurrency=-1)
+        with pytest.raises(OptionsError):
+            tctx.configure(cp, client_replay_concurrency=-2)