diff --git a/crates/llm_gateway/src/stream_context.rs b/crates/llm_gateway/src/stream_context.rs
index afb0b050..c5bc064b 100644
--- a/crates/llm_gateway/src/stream_context.rs
+++ b/crates/llm_gateway/src/stream_context.rs
@@ -809,6 +809,10 @@ impl HttpContext for StreamContext {
             return Action::Continue;
         }
 
+        // Capture request ID and traceparent early so all subsequent log messages include them
+        self.request_id = self.get_http_request_header(REQUEST_ID_HEADER);
+        self.traceparent = self.get_http_request_header(TRACE_PARENT_HEADER);
+
         // Capture HTTP method and protocol for tracing
         self.http_method = self.get_http_request_header(":method");
         self.http_protocol = self.get_http_request_header(":scheme");
@@ -884,9 +888,6 @@ impl HttpContext for StreamContext {
         self.delete_content_length_header();
         self.save_ratelimit_header();
 
-        self.request_id = self.get_http_request_header(REQUEST_ID_HEADER);
-        self.traceparent = self.get_http_request_header(TRACE_PARENT_HEADER);
-
         Action::Continue
     }