diff --git a/helpers/projects.py b/helpers/projects.py
index 41bbf9d44d..c373268027 100644
--- a/helpers/projects.py
+++ b/helpers/projects.py
@@ -648,7 +648,7 @@ def load_project_subagents(name: str) -> dict[str, SubAgentSettings]:
         abs_path = files.get_abs_path(get_project_meta(name), "agents.json")
         data = dirty_json.parse(files.read_file(abs_path))
         if isinstance(data, dict):
-            return _normalize_subagents(data)  # type: ignore[arg-type,return-value]
+            return _normalize_subagents(data, name)  # type: ignore[arg-type,return-value]
         return {}
     except Exception:
         return {}
@@ -656,17 +656,18 @@ def load_project_subagents(name: str) -> dict[str, SubAgentSettings]:
 
 def save_project_subagents(name: str, subagents_data: dict[str, SubAgentSettings]):
     abs_path = files.get_abs_path(get_project_meta(name), "agents.json")
-    normalized = _normalize_subagents(subagents_data)
+    normalized = _normalize_subagents(subagents_data, name)
     content = dirty_json.stringify(normalized)
     files.write_file(abs_path, content)
 
 
 def _normalize_subagents(
-    subagents_data: dict[str, SubAgentSettings]
+    subagents_data: dict[str, SubAgentSettings],
+    project_name: str,
 ) -> dict[str, SubAgentSettings]:
     from helpers import subagents
 
-    agents_dict = subagents.get_agents_dict()
+    agents_dict = subagents.get_agents_dict(project_name)
 
     normalized: dict[str, SubAgentSettings] = {}
     for key, value in subagents_data.items():
diff --git a/helpers/subagents.py b/helpers/subagents.py
index df9d5ae209..98e869fcfa 100644
--- a/helpers/subagents.py
+++ b/helpers/subagents.py
@@ -319,7 +319,7 @@ def get_available_agents_dict(
     project_name: str | None,
 ) -> dict[str, SubAgentListItem]:
     # all available agents
-    all_agents = get_agents_dict()
+    all_agents = get_agents_dict(project_name)
     # filter by project settings
     from helpers import projects