diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index f2b6da624..f3c3b9253 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1938,26 +1938,26 @@ out:
 
 static command_t CommandTable[] =  {
     {"help",        CmdHelp,                        AlwaysAvailable, "This help"},
-    {"exec",        CmdEMVExec,                     IfPm3Present,    "Executes EMV contactless transaction."},
-    {"pse",         CmdEMVPPSE,                     IfPm3Present,    "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
-    {"search",      CmdEMVSearch,                   IfPm3Present,    "Try to select all applets from applets list and print installed applets."},
-    {"select",      CmdEMVSelect,                   IfPm3Present,    "Select applet."},
-    {"gpo",         CmdEMVGPO,                      IfPm3Present,    "Execute GetProcessingOptions."},
-    {"readrec",     CmdEMVReadRecord,               IfPm3Present,    "Read files from card."},
-    {"genac",       CmdEMVAC,                       IfPm3Present,    "Generate ApplicationCryptogram."},
-    {"challenge",   CmdEMVGenerateChallenge,        IfPm3Present,    "Generate challenge."},
-    {"intauth",     CmdEMVInternalAuthenticate,     IfPm3Present,    "Internal authentication."},
-    {"scan",        CmdEMVScan,                     IfPm3Present,    "Scan EMV card and save it contents to json file for emulator."},
-    {"test",        CmdEMVTest,                     IfPm3Present,    "Crypto logic test."},
+    {"exec",        CmdEMVExec,                     IfPm3Iso14443,   "Executes EMV contactless transaction."},
+    {"pse",         CmdEMVPPSE,                     IfPm3Iso14443,   "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
+    {"search",      CmdEMVSearch,                   IfPm3Iso14443,   "Try to select all applets from applets list and print installed applets."},
+    {"select",      CmdEMVSelect,                   IfPm3Iso14443,   "Select applet."},
+    {"gpo",         CmdEMVGPO,                      IfPm3Iso14443,   "Execute GetProcessingOptions."},
+    {"readrec",     CmdEMVReadRecord,               IfPm3Iso14443,   "Read files from card."},
+    {"genac",       CmdEMVAC,                       IfPm3Iso14443,   "Generate ApplicationCryptogram."},
+    {"challenge",   CmdEMVGenerateChallenge,        IfPm3Iso14443,   "Generate challenge."},
+    {"intauth",     CmdEMVInternalAuthenticate,     IfPm3Iso14443,   "Internal authentication."},
+    {"scan",        CmdEMVScan,                     IfPm3Iso14443,   "Scan EMV card and save it contents to json file for emulator."},
+    {"test",        CmdEMVTest,                     AlwaysAvailable, "Crypto logic test."},
     /*
-    {"getrng",      CmdEMVGetrng,                   IfPm3Present,    "get random number from terminal"},
-    {"eload",       CmdEmvELoad,                    IfPm3Present,    "load EMV tag into device"},
-    {"dump",        CmdEmvDump,                     IfPm3Present,    "dump EMV tag values"},
-    {"sim",         CmdEmvSim,                      IfPm3Present,    "simulate EMV tag"},
-    {"clone",       CmdEmvClone,                    IfPm3Present,    "clone an EMV tag"},
+    {"getrng",      CmdEMVGetrng,                   IfPm3Iso14443,   "get random number from terminal"},
+    {"eload",       CmdEmvELoad,                    IfPm3Iso14443,   "load EMV tag into device"},
+    {"dump",        CmdEmvDump,                     IfPm3Iso14443,   "dump EMV tag values"},
+    {"sim",         CmdEmvSim,                      IfPm3Iso14443,   "simulate EMV tag"},
+    {"clone",       CmdEmvClone,                    IfPm3Iso14443,   "clone an EMV tag"},
     */
-    {"list",        CmdEMVList,                     IfPm3Present,    "List ISO7816 history"},
-    {"roca",        CmdEMVRoca,                     IfPm3Present,    "Extract public keys and run ROCA test"},
+    {"list",        CmdEMVList,                     IfPm3Iso14443,   "List ISO7816 history"},
+    {"roca",        CmdEMVRoca,                     IfPm3Iso14443,   "Extract public keys and run ROCA test"},
     {NULL, NULL, NULL, NULL}
 };