diff --git a/crates/brightstaff/src/handlers/agent_chat_completions.rs b/crates/brightstaff/src/handlers/agent_chat_completions.rs
index 2a8d8afa..34a9ce65 100644
--- a/crates/brightstaff/src/handlers/agent_chat_completions.rs
+++ b/crates/brightstaff/src/handlers/agent_chat_completions.rs
@@ -349,6 +349,9 @@ async fn handle_agent_chat(
             response_text.len()
         );
 
+        // remove last message and add new one at the end
+        let last_message = current_messages.pop().unwrap();
+
         // Create a new message with the agent's response as assistant message
         // and add it to the conversation history
         current_messages.push(OpenAIMessage {
@@ -359,6 +362,8 @@ async fn handle_agent_chat(
             tool_call_id: None,
         });
 
+        current_messages.push(last_message);
+
     }
 
     // This should never be reached since we return in the last agent iteration
diff --git a/demos/use_cases/travel_agents/src/travel_agents/currency_agent.py b/demos/use_cases/travel_agents/src/travel_agents/currency_agent.py
index b6132403..43692460 100644
--- a/demos/use_cases/travel_agents/src/travel_agents/currency_agent.py
+++ b/demos/use_cases/travel_agents/src/travel_agents/currency_agent.py
@@ -402,7 +402,7 @@ Use this data to answer the user's currency exchange query.
 
     response_messages = [
         {"role": "system", "content": SYSTEM_PROMPT},
-        {"role": "system", "content": currency_context},
+        {"role": "assistant", "content": currency_context},
     ]
 
     # Add conversation history
diff --git a/demos/use_cases/travel_agents/src/travel_agents/flight_agent.py b/demos/use_cases/travel_agents/src/travel_agents/flight_agent.py
index 3168f387..57655c8f 100644
--- a/demos/use_cases/travel_agents/src/travel_agents/flight_agent.py
+++ b/demos/use_cases/travel_agents/src/travel_agents/flight_agent.py
@@ -664,7 +664,7 @@ Example: "I'd be happy to help you find flights! Could you please tell me both t
 
     response_messages = [
         {"role": "system", "content": SYSTEM_PROMPT},
-        {"role": "system", "content": flight_context},
+        {"role": "assistant", "content": flight_context},
     ]
 
     # Add conversation history
diff --git a/demos/use_cases/travel_agents/src/travel_agents/weather_agent.py b/demos/use_cases/travel_agents/src/travel_agents/weather_agent.py
index 364c5d62..74dfcd52 100644
--- a/demos/use_cases/travel_agents/src/travel_agents/weather_agent.py
+++ b/demos/use_cases/travel_agents/src/travel_agents/weather_agent.py
@@ -508,7 +508,7 @@ Use this data to answer the user's weather query.
 
     response_messages = [
         {"role": "system", "content": SYSTEM_PROMPT},
-        {"role": "system", "content": weather_context},
+        {"role": "assistant", "content": weather_context},
     ]
 
     # Add conversation history