diff --git a/lang_agent/components/client_tool_manager.py b/lang_agent/components/client_tool_manager.py
index 0997c25..fe5fd92 100644
--- a/lang_agent/components/client_tool_manager.py
+++ b/lang_agent/components/client_tool_manager.py
@@ -262,6 +262,10 @@ class ClientToolManager:
             if self.config.tool_keys is None:
                 to_load_config = self.mcp_configs
             else:
+                if len(self.config.tool_keys) == 0:
+                    logger.info("no tools will be loaded")
+                    return {}
+
                 to_load_config = {}
                 for key in self.config.tool_keys:
                     val = self.mcp_configs.get(key)