diff --git a/src/utils.jl b/src/utils.jl
index 63f546a..3eb18b9 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -118,7 +118,10 @@ function prepareContext(state::agentState, eventSink)::agentContext
   preparedSystemPrompt = state.systemPrompt
 
   #TODO add system prompt, adjust/modify and inject additional context into messages
-  preparedMessages = deepcopy(state.messages) # messages that will be send to LLM
+  _preparedMessages = deepcopy(state.messages) # messages that will be send to LLM
+
+  #TODO filter out message that agent call tools.
+  preparedMessages = filter(m -> !(m isa assistantMessageToolCall), _preparedMessages)
 
   agentCtx = agentContext(preparedSystemPrompt, preparedMessages, filteredTools)