diff --git a/fastapi_server/server.py b/fastapi_server/server.py
index aa9328c..834d88a 100644
--- a/fastapi_server/server.py
+++ b/fastapi_server/server.py
@@ -91,7 +91,7 @@ async def chat_completions(
         for message in request.messages:
             if message.role == "user":
                 user_message = message.content
-            elif message.role == "system":
+            elif message.role == "system" or message.role == "assistant":
                 system_message = message.content
         
         if not user_message: