diff --git a/src/chatdbg/assistant/assistant.py b/src/chatdbg/assistant/assistant.py
index 570ff69..53e1f19 100644
--- a/src/chatdbg/assistant/assistant.py
+++ b/src/chatdbg/assistant/assistant.py
@@ -271,6 +271,9 @@ def _streamed_query(self, prompt: str, user_text):
             # has only tool calls, and skip this step
             response_message = completion.choices[0].message
             if response_message.content != None:
+                # fix: remove tool calls.  They get added below.
+                response_message = response_message.copy()
+                response_message["tool_calls"] = None                
                 self._conversation.append(response_message.json())
 
             if response_message.content != None: