diff --git a/packages/toolbox-core/src/toolbox_core/client.py b/packages/toolbox-core/src/toolbox_core/client.py
index a5082163..14dba866 100644
--- a/packages/toolbox-core/src/toolbox_core/client.py
+++ b/packages/toolbox-core/src/toolbox_core/client.py
@@ -79,7 +79,7 @@ def __parse_tool(
             else:  # regular parameter
                 params.append(p)
 
-        authn_params, _ = identify_required_authn_params(
+        authn_params, used_auth_keys = identify_required_authn_params(
             authn_params, auth_token_getters.keys()
         )
 
@@ -97,9 +97,6 @@ def __parse_tool(
         )
 
         used_bound_keys = set(bound_params.keys())
-        used_auth_keys: set[str] = set()
-        for required_sources in authn_params.values():
-            used_auth_keys.update(required_sources)
 
         return tool, used_auth_keys, used_bound_keys