diff --git a/mitmproxy/addons/proxyserver.py b/mitmproxy/addons/proxyserver.py
index 020c3712f..f9552b2c7 100644
--- a/mitmproxy/addons/proxyserver.py
+++ b/mitmproxy/addons/proxyserver.py
@@ -1,10 +1,46 @@
 import asyncio
+import queue
 import threading
 
-from mitmproxy import ctx
-from mitmproxy.proxy.protocol2.server.server_async import ConnectionHandler
+from mitmproxy import ctx, controller, log
+from mitmproxy.proxy.protocol2 import commands
+from mitmproxy.proxy.protocol2 import events
+from mitmproxy.proxy.protocol2.server import server_async
 
 
+class AsyncReply(controller.Reply):
+    # temporary glue code - let's see how many years it survives.
+    def __init__(self, submit, *args):
+        self.submit = submit
+        super().__init__(*args)
+
+    def commit(self):
+        super().commit()
+        self.submit(self.q.get_nowait())
+
+
+class ProxyConnectionHandler(server_async.ConnectionHandler):
+    event_queue: queue.Queue
+    loop: asyncio.AbstractEventLoop
+
+    def __init__(self, event_queue, loop, r, w):
+        self.event_queue = event_queue
+        self.loop = loop
+        super().__init__(r, w)
+
+    async def handle_hook(self, hook: commands.Hook) -> None:
+        q = asyncio.Queue()
+        submit = lambda x: self.loop.call_soon_threadsafe(lambda: q.put_nowait(x))
+        hook.data.reply = AsyncReply(submit, hook.data)
+        self.event_queue.put((hook.name, hook.data))
+        reply = await q.get()
+        self.server_event(events.HookReply(hook, reply))
+
+    def _debug(self, *args):
+        x = log.LogEntry(" ".join(str(x) for x in args), "warn")
+        x.reply = controller.DummyReply()
+        self.event_queue.put(("log",  x))
+
 class Proxyserver:
     """
     This addon runs the actual proxy server.
@@ -37,7 +73,7 @@ class Proxyserver:
             )
 
     async def handle_connection(self, r, w):
-        await ConnectionHandler(self.event_queue, r, w).handle_client()
+        await ProxyConnectionHandler(self.event_queue, self.loop, r, w).handle_client()
 
     def configure(self, updated):
         if "listen_port" in updated: