diff --git a/src/backend/langflow/interface/agents/custom.py b/src/backend/langflow/interface/agents/custom.py
index 109cbaa7f..67827bd9d 100644
--- a/src/backend/langflow/interface/agents/custom.py
+++ b/src/backend/langflow/interface/agents/custom.py
@@ -51,7 +51,7 @@ class JsonAgent(AgentExecutor):
     @classmethod
     def from_toolkit_and_llm(cls, toolkit: JsonToolkit, llm: BaseLanguageModel):
         tools = toolkit.get_tools()
-        tool_names = {tool.name for tool in tools}
+        tool_names = [tool.name for tool in tools]
         prompt = ZeroShotAgent.create_prompt(
             tools,
             prefix=JSON_PREFIX,
@@ -109,7 +109,7 @@ class CSVAgent(AgentExecutor):
             llm=llm,
             prompt=partial_prompt,
         )
-        tool_names = {tool.name for tool in tools}
+        tool_names = [tool.name for tool in tools]
         agent = ZeroShotAgent(llm_chain=llm_chain, allowed_tools=tool_names, **kwargs)
 
         return cls.from_agent_and_tools(agent=agent, tools=tools, verbose=True)
@@ -146,7 +146,7 @@ class VectorStoreAgent(AgentExecutor):
             llm=llm,
             prompt=prompt,
         )
-        tool_names = {tool.name for tool in tools}
+        tool_names = [tool.name for tool in tools]
         agent = ZeroShotAgent(llm_chain=llm_chain, allowed_tools=tool_names, **kwargs)
         return AgentExecutor.from_agent_and_tools(
             agent=agent, tools=tools, verbose=True
@@ -212,7 +212,7 @@ class SQLAgent(AgentExecutor):
             llm=llm,
             prompt=prompt,
         )
-        tool_names = {tool.name for tool in tools}  # type: ignore
+        tool_names = [tool.name for tool in tools]  # type: ignore
         agent = ZeroShotAgent(llm_chain=llm_chain, allowed_tools=tool_names, **kwargs)
         return AgentExecutor.from_agent_and_tools(
             agent=agent,
@@ -255,7 +255,7 @@ class VectorStoreRouterAgent(AgentExecutor):
             llm=llm,
             prompt=prompt,
         )
-        tool_names = {tool.name for tool in tools}
+        tool_names = [tool.name for tool in tools]
         agent = ZeroShotAgent(llm_chain=llm_chain, allowed_tools=tool_names, **kwargs)
         return AgentExecutor.from_agent_and_tools(
             agent=agent, tools=tools, verbose=True
diff --git a/src/backend/langflow/interface/agents/prebuilt.py b/src/backend/langflow/interface/agents/prebuilt.py
index 58d8d561f..957dd4f7d 100644
--- a/src/backend/langflow/interface/agents/prebuilt.py
+++ b/src/backend/langflow/interface/agents/prebuilt.py
@@ -21,7 +21,7 @@ class MalfoyAgent(AgentExecutor):
     @classmethod
     def from_toolkit_and_llm(cls, toolkit: JsonToolkit, llm: BaseLanguageModel):
         tools = toolkit.get_tools()
-        tool_names = {tool.name for tool in tools}
+        tool_names = [tool.name for tool in tools]
         prompt = ZeroShotAgent.create_prompt(
             tools,
             prefix=JSON_PREFIX,
diff --git a/src/backend/langflow/interface/loading.py b/src/backend/langflow/interface/loading.py
index 5afc0c865..c237bb5f3 100644
--- a/src/backend/langflow/interface/loading.py
+++ b/src/backend/langflow/interface/loading.py
@@ -1,5 +1,5 @@
 import json
-from typing import Any, Callable, Dict, Iterable, Optional
+from typing import Any, Callable, Dict, Optional
 
 from langchain.agents import ZeroShotAgent
 from langchain.agents import agent as agent_module
@@ -180,7 +180,7 @@ def load_agent_executor_from_config(
     **kwargs: Any,
 ):
     tools = load_tools_from_config(config["allowed_tools"])
-    config["allowed_tools"] = {tool.name for tool in tools} if tools else []
+    config["allowed_tools"] = [tool.name for tool in tools] if tools else []
     agent_obj = load_agent_from_config(config, llm, tools, **kwargs)
 
     return AgentExecutor.from_agent_and_tools(