diff --git a/src/llama_stack_client/lib/agents/agent.py b/src/llama_stack_client/lib/agents/agent.py
index 504ef5e8..26b25f79 100644
--- a/src/llama_stack_client/lib/agents/agent.py
+++ b/src/llama_stack_client/lib/agents/agent.py
@@ -32,6 +32,8 @@ def __init__(
     ):
         self.client = client
         self.agent_config = agent_config
+        if "client_tools" not in self.agent_config.keys():
+            self.agent_config["client_tools"] = [client_tool.get_tool_definition() for client_tool in client_tools]
         self.agent_id = self._create_agent(agent_config)
         self.client_tools = {t.get_name(): t for t in client_tools}
         self.sessions = []