diff --git a/examples/chat-ui/src/components/ChatApp.tsx b/examples/chat-ui/src/components/ChatApp.tsx
index caa52c5..0d56519 100644
--- a/examples/chat-ui/src/components/ChatApp.tsx
+++ b/examples/chat-ui/src/components/ChatApp.tsx
@@ -143,6 +143,7 @@ const ChatApp: React.FC<ChatAppProps> = () => {
             onModelChange={handleModelChange}
             apiKeyUpdateTrigger={apiKeyUpdateTrigger}
             mcpTools={mcpTools}
+            onMcpToolsUpdate={setMcpTools}
           />
         </div>
       </div>
diff --git a/examples/chat-ui/src/components/ConversationThread.tsx b/examples/chat-ui/src/components/ConversationThread.tsx
index ca8c9bb..0d3bb46 100644
--- a/examples/chat-ui/src/components/ConversationThread.tsx
+++ b/examples/chat-ui/src/components/ConversationThread.tsx
@@ -27,6 +27,7 @@ interface ConversationThreadProps {
   onModelChange: (model: Model) => void
   apiKeyUpdateTrigger: number
   mcpTools: Tool[]
+  onMcpToolsUpdate: (tools: Tool[]) => void
 }
 
 const ConversationThread: React.FC<ConversationThreadProps> = ({
@@ -40,6 +41,7 @@ const ConversationThread: React.FC<ConversationThreadProps> = ({
   onModelChange,
   apiKeyUpdateTrigger,
   mcpTools,
+  onMcpToolsUpdate,
 }) => {
   const [input, setInput] = useState<string>('')
   const [apiKeyModal, setApiKeyModal] = useState<{ isOpen: boolean; model: Model | null }>({
@@ -269,9 +271,7 @@ const ConversationThread: React.FC<ConversationThreadProps> = ({
       <McpServerModal
         isOpen={mcpServerModal}
         onClose={() => setMcpServerModal(false)}
-        onToolsUpdate={(tools) => {
-          // This will be handled by the existing MCP tools logic in ChatApp
-        }}
+        onToolsUpdate={onMcpToolsUpdate}
       />
     </div>
   )