diff --git a/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs
index 45e0c9748ef..af0605bb66d 100644
--- a/cli/src/tunnels/control_server.rs
+++ b/cli/src/tunnels/control_server.rs
@@ -278,8 +278,8 @@ fn make_socket_rpc(
 	port_forwarding: Option<PortForwarding>,
 	requires_auth: AuthRequired,
 	platform: Platform,
+	http_requests: HttpRequestsMap,
 ) -> RpcDispatcher<MsgPackSerializer, HandlerContext> {
-	let http_requests = Arc::new(std::sync::Mutex::new(HashMap::new()));
 	let server_bridges = ServerMultiplexer::new();
 	let mut rpc = RpcBuilder::new(MsgPackSerializer {}).methods(HandlerContext {
 		did_update: Arc::new(AtomicBool::new(false)),
@@ -377,7 +377,10 @@ fn make_socket_rpc(
 	);
 	rpc.register_sync("httpheaders", |p: HttpHeadersParams, c| {
 		if let Some(req) = c.http_requests.lock().unwrap().get(&p.req_id) {
+			trace!(c.log, "got {} response for req {}", p.status_code, p.req_id);
 			req.initial_response(p.status_code, p.headers);
+		} else {
+			warning!(c.log, "got response for unknown req {}", p.req_id);
 		}
 		Ok(EmptyObject {})
 	});
@@ -388,6 +391,7 @@ fn make_socket_rpc(
 				req.body(p.segment);
 			}
 			if p.complete {
+				trace!(c.log, "delegated request {} completed", p.req_id);
 				reqs.remove(&p.req_id);
 			}
 		}
@@ -441,6 +445,7 @@ async fn process_socket(
 		port_forwarding,
 		requires_auth,
 		platform,
+		http_requests.clone(),
 	);
 
 	{
@@ -497,6 +502,7 @@ async fn process_socket(
 					}),
 				})
 				.unwrap();
+
 				http_requests.lock().unwrap().insert(id, r);
 
 				tx_counter += serialized.len();