diff --git a/src/fido/cmd_register.c b/src/fido/cmd_register.c
index 877f5b0..1be7e55 100644
--- a/src/fido/cmd_register.c
+++ b/src/fido/cmd_register.c
@@ -33,9 +33,12 @@ int u2f_unload();
 int u2f_process_apdu();
 
 int u2f_select(app_t *a) {
-    a->process_apdu = u2f_process_apdu;
-    a->unload = u2f_unload;
-    return CCID_OK;
+    if (cap_supported(CAP_U2F)) {
+        a->process_apdu = u2f_process_apdu;
+        a->unload = u2f_unload;
+        return CCID_OK;
+    }
+    return CCID_ERR_FILE_NOT_FOUND;
 }
 
 void __attribute__((constructor)) u2f_ctor() {
diff --git a/src/fido/fido.c b/src/fido/fido.c
index 32db925..4431136 100644
--- a/src/fido/fido.c
+++ b/src/fido/fido.c
@@ -55,9 +55,12 @@ const uint8_t atr_fido[] = {
 };
 
 int fido_select(app_t *a) {
-    a->process_apdu = fido_process_apdu;
-    a->unload = fido_unload;
-    return CCID_OK;
+    if (cap_supported(CAP_FIDO2)) {
+        a->process_apdu = fido_process_apdu;
+        a->unload = fido_unload;
+        return CCID_OK;
+    }
+    return CCID_ERR_FILE_NOT_FOUND;
 }
 
 void __attribute__((constructor)) fido_ctor() {
diff --git a/src/fido/oath.c b/src/fido/oath.c
index a0713c9..0a9b9a3 100644
--- a/src/fido/oath.c
+++ b/src/fido/oath.c
@@ -69,41 +69,44 @@ const uint8_t oath_aid[] = {
 };
 
 int oath_select(app_t *a) {
-    a->process_apdu = oath_process_apdu;
-    a->unload = oath_unload;
-    res_APDU_size = 0;
-    res_APDU[res_APDU_size++] = TAG_T_VERSION;
-    res_APDU[res_APDU_size++] = 3;
-    res_APDU[res_APDU_size++] = PICO_FIDO_VERSION_MAJOR;
-    res_APDU[res_APDU_size++] = PICO_FIDO_VERSION_MINOR;
-    res_APDU[res_APDU_size++] = 0;
-    res_APDU[res_APDU_size++] = TAG_NAME;
-    res_APDU[res_APDU_size++] = 8;
+    if (cap_supported(CAP_OATH)) {
+        a->process_apdu = oath_process_apdu;
+        a->unload = oath_unload;
+        res_APDU_size = 0;
+        res_APDU[res_APDU_size++] = TAG_T_VERSION;
+        res_APDU[res_APDU_size++] = 3;
+        res_APDU[res_APDU_size++] = PICO_FIDO_VERSION_MAJOR;
+        res_APDU[res_APDU_size++] = PICO_FIDO_VERSION_MINOR;
+        res_APDU[res_APDU_size++] = 0;
+        res_APDU[res_APDU_size++] = TAG_NAME;
+        res_APDU[res_APDU_size++] = 8;
 #ifndef ENABLE_EMULATION
-    pico_get_unique_board_id((pico_unique_board_id_t *) (res_APDU + res_APDU_size));
-    res_APDU_size += 8;
+	    pico_get_unique_board_id((pico_unique_board_id_t *) (res_APDU + res_APDU_size));
+	    res_APDU_size += 8;
 #else
-    memset(res_APDU + res_APDU_size, 0, 8); res_APDU_size += 8;
+    	memset(res_APDU + res_APDU_size, 0, 8); res_APDU_size += 8;
 #endif
-    if (file_has_data(search_dynamic_file(EF_OATH_CODE)) == true) {
-        random_gen(NULL, challenge, sizeof(challenge));
-        res_APDU[res_APDU_size++] = TAG_CHALLENGE;
-        res_APDU[res_APDU_size++] = sizeof(challenge);
-        memcpy(res_APDU + res_APDU_size, challenge, sizeof(challenge));
-        res_APDU_size += sizeof(challenge);
-    }
-    file_t *ef_otp_pin = search_by_fid(EF_OTP_PIN, NULL, SPECIFY_EF);
-    if (file_has_data(ef_otp_pin)) {
-        const uint8_t *pin_data = file_get_data(ef_otp_pin);
-        res_APDU[res_APDU_size++] = TAG_PIN_COUNTER;
+        if (file_has_data(search_dynamic_file(EF_OATH_CODE)) == true) {
+            random_gen(NULL, challenge, sizeof(challenge));
+            res_APDU[res_APDU_size++] = TAG_CHALLENGE;
+            res_APDU[res_APDU_size++] = sizeof(challenge);
+            memcpy(res_APDU + res_APDU_size, challenge, sizeof(challenge));
+            res_APDU_size += sizeof(challenge);
+        }
+        file_t *ef_otp_pin = search_by_fid(EF_OTP_PIN, NULL, SPECIFY_EF);
+        if (file_has_data(ef_otp_pin)) {
+            const uint8_t *pin_data = file_get_data(ef_otp_pin);
+            res_APDU[res_APDU_size++] = TAG_PIN_COUNTER;
+            res_APDU[res_APDU_size++] = 1;
+            res_APDU[res_APDU_size++] = *pin_data;
+        }
+        res_APDU[res_APDU_size++] = TAG_ALGO;
         res_APDU[res_APDU_size++] = 1;
-        res_APDU[res_APDU_size++] = *pin_data;
+        res_APDU[res_APDU_size++] = ALG_HMAC_SHA1;
+        apdu.ne = res_APDU_size;
+        return CCID_OK;
     }
-    res_APDU[res_APDU_size++] = TAG_ALGO;
-    res_APDU[res_APDU_size++] = 1;
-    res_APDU[res_APDU_size++] = ALG_HMAC_SHA1;
-    apdu.ne = res_APDU_size;
-    return CCID_OK;
+    return CCID_ERR_FILE_NOT_FOUND;
 }
 
 void __attribute__((constructor)) oath_ctor() {
diff --git a/src/fido/otp.c b/src/fido/otp.c
index 3bfce0d..7a8bfd3 100644
--- a/src/fido/otp.c
+++ b/src/fido/otp.c
@@ -117,20 +117,23 @@ const uint8_t otp_aid[] = {
 };
 
 int otp_select(app_t *a) {
-    a->process_apdu = otp_process_apdu;
-    a->unload = otp_unload;
-    if (file_has_data(search_dynamic_file(EF_OTP_SLOT1)) ||
-        file_has_data(search_dynamic_file(EF_OTP_SLOT2))) {
-        config_seq = 1;
+    if (cap_supported(CAP_OTP)) {
+        a->process_apdu = otp_process_apdu;
+        a->unload = otp_unload;
+        if (file_has_data(search_dynamic_file(EF_OTP_SLOT1)) ||
+            file_has_data(search_dynamic_file(EF_OTP_SLOT2))) {
+            config_seq = 1;
+        }
+        else {
+            config_seq = 0;
+        }
+        otp_status();
+        memmove(res_APDU, res_APDU + 1, 6);
+        res_APDU_size = 6;
+        apdu.ne = res_APDU_size;
+        return CCID_OK;
     }
-    else {
-        config_seq = 0;
-    }
-    otp_status();
-    memmove(res_APDU, res_APDU + 1, 6);
-    res_APDU_size = 6;
-    apdu.ne = res_APDU_size;
-    return CCID_OK;
+    return CCID_ERR_FILE_NOT_FOUND;
 }
 
 uint8_t modhex_tab[] =