diff --git a/crates/collab/src/llm.rs b/crates/collab/src/llm.rs
index 609610f15c65585441c10c1387837673817c83c7..2bffc3994784a7a4239e3c24e9ac3966e26e0493 100644
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -138,7 +138,9 @@ async fn validate_api_token<B>(mut req: Request<B>, next: Next<B>) -> impl IntoR
                 ));
             }
 
-            tracing::Span::current().record("authn.jti", &claims.jti);
+            tracing::Span::current()
+                .record("user_id", claims.user_id)
+                .record("authn.jti", &claims.jti);
 
             req.extensions_mut().insert(claims);
             Ok::<_, Error>(next.run(req).await.into_response())
diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index 6994109443623f3f03c7db94fff3a21cf67316fd..d070036e6409b838422e1b7eae146e85168460e6 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -150,6 +150,7 @@ async fn main() -> Result<()> {
                             "http_request",
                             method = ?request.method(),
                             matched_path,
+                            user_id = tracing::field::Empty,
                             authn.jti = tracing::field::Empty
                         )
                     })