diff --git a/src/modules/llms/api/athropic.ts b/src/modules/llms/api/athropic.ts
index 21b983d..a470c0b 100644
--- a/src/modules/llms/api/athropic.ts
+++ b/src/modules/llms/api/athropic.ts
@@ -70,7 +70,7 @@ export const anthropicStreamCompletion = async (
     stream: true,
     system: config.openAi.chatGpt.chatCompletionContext,
     max_tokens: limitTokens ? +config.openAi.chatGpt.maxTokens : undefined,
-    messages: conversation.filter(c => c.model === model) // .map(m => { return { content: m.content, role: m.role } })
+    messages: conversation.filter(c => c.model === model && c.role !== 'system') // .map(m => { return { content: m.content, role: m.role } })
   }
   let wordCount = 0
   let wordCountMinimum = 2
@@ -166,7 +166,7 @@ export const toolsChatCompletion = async (
     stream: false,
     system: config.openAi.chatGpt.chatCompletionContext,
     max_tokens: +config.openAi.chatGpt.maxTokens,
-    messages: conversation.filter(c => c.model === model)
+    messages: conversation.filter(c => c.model === model && c.role !== 'system')
       .map(m => { return { content: m.content, role: m.role } })
   }
   const url = `${API_ENDPOINT}/anthropic/completions/tools`
diff --git a/src/modules/llms/api/vertex.ts b/src/modules/llms/api/vertex.ts
index 454dc6b..5618a80 100644
--- a/src/modules/llms/api/vertex.ts
+++ b/src/modules/llms/api/vertex.ts
@@ -71,7 +71,7 @@ export const vertexStreamCompletion = async (
     stream: true, // Set stream to true to receive the completion as a stream
     system: config.openAi.chatGpt.chatCompletionContext,
     max_tokens: limitTokens ? +config.openAi.chatGpt.maxTokens : undefined,
-    messages: conversation.filter(c => c.model === model)
+    messages: conversation.filter(c => c.model === model && c.role !== 'system')
     // .map(m => { return { parts: { text: m.content }, role: m.role !== 'user' ? 'model' : 'user' } })
   }
   const url = `${API_ENDPOINT}/llms/completions` // `${API_ENDPOINT}/vertex/completions/gemini`
diff --git a/src/modules/llms/llmsBase.ts b/src/modules/llms/llmsBase.ts
index 280765f..20a6d7b 100644
--- a/src/modules/llms/llmsBase.ts
+++ b/src/modules/llms/llmsBase.ts
@@ -209,7 +209,8 @@ export abstract class LlmsBase implements PayableBot {
           if (chatConversation.length === 0) {
             chatConversation.push({
               role: 'system',
-              content: config.openAi.chatGpt.chatCompletionContext
+              content: config.openAi.chatGpt.chatCompletionContext,
+              model
             })
           }
           // const hasCode = hasCodeSnippet(ctx)