diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c
index 6c1c2d322..4e081c94f 100644
--- a/client/src/cmdhf14a.c
+++ b/client/src/cmdhf14a.c
@@ -906,7 +906,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         if (card)
             memcpy(card, vcard, sizeof(iso14a_card_select_t));
     }
-
+    SetISODEPState(ISODEP_NFCA);
     if (disconnect)
         DropField();
 
diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c
index 8575472af..f390b96a1 100644
--- a/client/src/cmdhf14b.c
+++ b/client/src/cmdhf14b.c
@@ -1599,7 +1599,7 @@ static int select_card_14443b_4(bool disconnect, iso14b_card_select_t *card) {
         switch_off_field_14b();
         return PM3_ESOFT;
     }
-
+    SetISODEPState(ISODEP_NFCB);
     apdu_frame_length = 0;
     // get frame length from ATS in card data structure
     iso14b_card_select_t *vcard = (iso14b_card_select_t *) resp.data.asBytes;