diff --git a/src/multi_swarm_core/multi_swarm_core/llm/client.py b/src/multi_swarm_core/multi_swarm_core/llm/client.py
index 13a4f04..31555d8 100644
--- a/src/multi_swarm_core/multi_swarm_core/llm/client.py
+++ b/src/multi_swarm_core/multi_swarm_core/llm/client.py
@@ -163,9 +163,11 @@ class LLMClient:
         model = self._tier_map[genome.model_tier]
         topic_id = self._get_or_create_topic(system)
 
+        prompt = f"[SYSTEM]\n{system}\n\n[USER]\n{user}" if session_id in (None, "new") else user
+
         body: dict = {
             "topic_id": topic_id,
-            "prompt": user,
+            "prompt": prompt,
             "model": model,
         }
         if session_id is not None: