diff --git a/crates/goose-server/src/routes/utils.rs b/crates/goose-server/src/routes/utils.rs
index 81bd41d6b4..9d5e19957d 100644
--- a/crates/goose-server/src/routes/utils.rs
+++ b/crates/goose-server/src/routes/utils.rs
@@ -94,13 +94,11 @@ pub fn inspect_keys(
 pub fn check_provider_configured(metadata: &ProviderMetadata, provider_type: ProviderType) -> bool {
     let config = Config::global();
 
-    // TODO(Douwe): if the provider doesn't need an API key, it should be considered configured always
     if provider_type == ProviderType::Custom || provider_type == ProviderType::Declarative {
         if let Ok(loaded_provider) = load_provider(metadata.name.as_str()) {
             return config
                 .get_secret::<String>(&loaded_provider.config.api_key_env)
-                .map(|s| !s.is_empty())
-                .unwrap_or(false);
+                .is_ok();
         }
     }
     // Special case: Zero-config providers (no config keys)