diff --git a/libraries/opensk/src/ctap/storage.rs b/libraries/opensk/src/ctap/storage.rs
index da9ea60..aabc0e2 100644
--- a/libraries/opensk/src/ctap/storage.rs
+++ b/libraries/opensk/src/ctap/storage.rs
@@ -440,6 +440,17 @@ pub fn force_pin_change(env: &mut impl Env) -> Result<(), Ctap2StatusCode> {
 }
 
 /// Returns whether enterprise attestation is enabled.
+///
+/// Without the AuthenticatorConfig command, customization determines the result.
+#[cfg(not(feature = "config_command"))]
+pub fn enterprise_attestation(env: &mut impl Env) -> Result<bool, Ctap2StatusCode> {
+    Ok(env.customization().enterprise_attestation_mode().is_some())
+}
+
+/// Returns whether enterprise attestation is enabled.
+///
+/// Use the AuthenticatorConfig command to turn it on.
+#[cfg(feature = "config_command")]
 pub fn enterprise_attestation(env: &mut impl Env) -> Result<bool, Ctap2StatusCode> {
     match env.store().find(key::ENTERPRISE_ATTESTATION)? {
         None => Ok(false),
diff --git a/libraries/opensk/src/ctap/storage/key.rs b/libraries/opensk/src/ctap/storage/key.rs
index 3736b37..78a87c3 100644
--- a/libraries/opensk/src/ctap/storage/key.rs
+++ b/libraries/opensk/src/ctap/storage/key.rs
@@ -95,6 +95,7 @@ make_partition! {
     ALWAYS_UV = 2038;
 
     /// If this entry exists and is empty, enterprise attestation is enabled.
+    #[cfg(feature = "config_command")]
     ENTERPRISE_ATTESTATION = 2039;
 
     /// If this entry exists and is empty, the PIN needs to be changed.