diff --git a/src/llm/prompt/builder.py b/src/llm/prompt/builder.py
index 4d588e27..b6d97a21 100644
--- a/src/llm/prompt/builder.py
+++ b/src/llm/prompt/builder.py
@@ -39,6 +39,7 @@ class PromptBuilder:
 
         if messages[0].role == Role.SYSTEM:
             system_parts.insert(0, messages[0].content)
+            result.insert(0, Message(role=Role.SYSTEM, content="\n\n".join(system_parts)))
             result.extend(messages[1:])
         else:
             if system_parts: