diff --git a/router/src/infer.rs b/router/src/infer.rs
index a4945512..bfa7b55c 100644
--- a/router/src/infer.rs
+++ b/router/src/infer.rs
@@ -979,24 +979,28 @@ mod tests {
                     content: Some("Hi!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("Hello how can I help?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "user".to_string(),
                     content: Some("What is Deep Learning?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("magic!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
             ],
             bos_token: Some("[BOS]"),
@@ -1049,30 +1053,35 @@ mod tests {
                     content: Some("Hi!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "user".to_string(),
                     content: Some("Hi again!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("Hello how can I help?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "user".to_string(),
                     content: Some("What is Deep Learning?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("magic!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
             ],
             bos_token: Some("[BOS]"),
@@ -1130,24 +1139,28 @@ mod tests {
                     content: Some("Hi!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("Hello how can I help?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "user".to_string(),
                     content: Some("What is Deep Learning?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("magic!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
             ],
             bos_token: Some("[BOS]"),
@@ -1189,24 +1202,28 @@ mod tests {
                     content: Some("Hi!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("Hello how can I help?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "user".to_string(),
                     content: Some("What is Deep Learning?".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
                 Message {
                     role: "assistant".to_string(),
                     content: Some("magic!".to_string()),
                     name: None,
                     tool_calls: None,
+                    tool_call_id: None,
                 },
             ],
             bos_token: Some("[BOS]"),
@@ -1234,18 +1251,21 @@ mod tests {
                 content: Some("Hello, how are you?".to_string()),
                 name: None,
                 tool_calls: None,
+                tool_call_id: None,
             },
             Message {
                 role: "assistant".to_string(),
                 content: Some("I'm doing great. How can I help you today?".to_string()),
                 name: None,
                 tool_calls: None,
+                tool_call_id: None,
             },
             Message {
                 role: "user".to_string(),
                 content: Some("I'd like to show off how chat templating works!".to_string()),
                 name: None,
                 tool_calls: None,
+                tool_call_id: None,
             },
         ];
 
@@ -1257,6 +1277,7 @@ mod tests {
             ),
             name: None,
             tool_calls: None,
+            tool_call_id: None,
         }]
         .iter()
         .chain(&example_chat)
@@ -1401,12 +1422,14 @@ mod tests {
                             content: Some("You are a friendly chatbot who always responds in the style of a pirate".to_string()),
                             name: None,
                             tool_calls: None,
+                            tool_call_id: None,
                         },
                         Message {
                             role: "user".to_string(),
                             content: Some("How many helicopters can a human eat in one sitting?".to_string()),
                             name: None,
                             tool_calls: None,
+                            tool_call_id: None,
                         },
                     ],
                     add_generation_prompt: true,
diff --git a/router/src/lib.rs b/router/src/lib.rs
index 96a9fdf6..82199946 100644
--- a/router/src/lib.rs
+++ b/router/src/lib.rs
@@ -546,6 +546,7 @@ impl ChatCompletion {
                     content: output,
                     name: None,
                     tool_calls,
+                    tool_call_id:None
                 },
                 logprobs: return_logprobs
                     .then(|| ChatCompletionLogprobs::from((details.tokens, details.top_tokens))),
@@ -961,6 +962,7 @@ pub(crate) struct Message {
     pub name: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub tool_calls: Option<Vec<ToolCall>>,
+    pub tool_call_id: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize, ToSchema)]