diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 132f8ba8f8..a10bdc3347 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1663,6 +1663,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             ReaderIso14443a(packet);
             break;
         }
+#ifdef WITH_SMARTCARD
         case CMD_HF_ISO14443A_EMV_SIMULATE: {
             struct p {
                 uint16_t flags;
@@ -1676,6 +1677,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             EMVsim(payload->flags, payload->exitAfter, payload->uid, payload->atqa, payload->sak);
             break;
         }
+#endif 
         case CMD_HF_ISO14443A_SIMULATE: {
             struct p {
                 uint8_t tagtype;
diff --git a/client/src/emv/cmdemv.c b/client/src/emv/cmdemv.c
index 38f23082b7..c5416a2438 100644
--- a/client/src/emv/cmdemv.c
+++ b/client/src/emv/cmdemv.c
@@ -2980,7 +2980,7 @@ static command_t CommandTable[] =  {
     {"search",      CmdEMVSearch,                   IfPm3Iso14443,   "Try to select all applets from applets list and print installed applets"},
     {"select",      CmdEMVSelect,                   IfPm3Iso14443,   "Select applet"},
     {"-----------", CmdHelp,                        IfPm3Iso14443a,  "---------------------- " _CYAN_("simulation") " ---------------------"},
-    {"smart2nfc",   CmdEMVSmartToNFC,               IfPm3Iso14443,   "Complete transaction as a nfc smart card, using the ISO-7816 interface for auth"},
+    {"smart2nfc",   CmdEMVSmartToNFC,               IfPm3Smartcard,  "Complete transaction as a nfc smart card, using the ISO-7816 interface for auth"},
     /*
     {"getrng",      CmdEMVGetrng,                   IfPm3Iso14443,   "Get random number from terminal"},
     {"eload",       CmdEmvELoad,                    IfPm3Iso14443,   "Load EMV tag into device"},