diff --git a/server-rs/crates/module-runtime/src/agc_model_access.rs b/server-rs/crates/module-runtime/src/agc_model_access.rs
index 051475330..a29e5793d 100644
--- a/server-rs/crates/module-runtime/src/agc_model_access.rs
+++ b/server-rs/crates/module-runtime/src/agc_model_access.rs
@@ -168,7 +168,7 @@ impl AgcModelCatalog {
                     .ok_or(AgcModelResolveError::Unavailable)?;
                 self.models
                     .iter()
-                    .find(|model| model.id == id && model.enabled)
+                    .find(|model| model.id == id && model.is_available_for(access))
                     .map(|model| model.model_id.as_str())
                     .ok_or(AgcModelResolveError::Unavailable)
             }