diff --git a/Sources/CodexBar/ProviderRegistry.swift b/Sources/CodexBar/ProviderRegistry.swift
index 465020b0..4e74ba37 100644
--- a/Sources/CodexBar/ProviderRegistry.swift
+++ b/Sources/CodexBar/ProviderRegistry.swift
@@ -98,6 +98,7 @@ struct ProviderRegistry {
             settings: settings,
             override: tokenOverride)
         var env = base
+        // If token account is selected, use its token instead of config's apiKey
         if let account, let override = TokenAccountSupportCatalog.envOverride(
             for: provider,
             token: account.token)
@@ -105,6 +106,7 @@ struct ProviderRegistry {
             for (key, value) in override {
                 env[key] = value
             }
+            return env
         }
         return ProviderConfigEnvironment.applyAPIKeyOverride(
             base: env,
diff --git a/Sources/CodexBarCLI/TokenAccountCLI.swift b/Sources/CodexBarCLI/TokenAccountCLI.swift
index a0a88371..2291b674 100644
--- a/Sources/CodexBarCLI/TokenAccountCLI.swift
+++ b/Sources/CodexBarCLI/TokenAccountCLI.swift
@@ -185,12 +185,14 @@ struct TokenAccountCLIContext {
         account: ProviderTokenAccount?) -> [String: String]
     {
         var env = base
+        // If token account is selected, use its token instead of config's apiKey
         if let account,
            let override = TokenAccountSupportCatalog.envOverride(for: provider, token: account.token)
         {
             for (key, value) in override {
                 env[key] = value
             }
+            return env
         }
         let providerConfig = self.providerConfig(for: provider)
         env = ProviderConfigEnvironment.applyAPIKeyOverride(