diff --git a/client/cmdmain.c b/client/cmdmain.c
index 618f04c73..eba34b2ca 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -102,7 +102,7 @@ static command_t CommandTable[] = {
     {"sc",      CmdSmartcard, IfPm3Smartcard,          "{ Smart card ISO7816 commands... }"},
     {"script",  CmdScript,    AlwaysAvailable,         "{ Scripting commands }"},
     {"trace",   CmdTrace,     AlwaysAvailable,         "{ Trace manipulation... }"},
-    {"usart",   CmdUsart,     IfPm3FpcUsartDevFromUsb, "{ USART commands... }"},
+    {"usart",   CmdUsart,     IfPm3FpcUsartFromUsb,    "{ USART commands... }"},
     {"quit",    CmdQuit,      AlwaysAvailable,         ""},
     {"exit",    CmdQuit,      AlwaysAvailable,         "Exit program"},
     {NULL, NULL, NULL, NULL}
diff --git a/client/cmdparser.c b/client/cmdparser.c
index d9ece2310..768941e10 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -72,6 +72,11 @@ bool IfPm3FpcUsartDevFromUsb(void) {
     return !conn.send_via_fpc_usart;
 }
 
+bool IfPm3FpcUsartFromUsb(void) {
+    // true if FPC USART Host or developer support and if talking from USB-CDC interface
+    return IfPm3FpcUsartHostFromUsb() || IfPm3FpcUsartDevFromUsb();
+}
+
 bool IfPm3Lf(void) {
     if (!IfPm3Present())
         return false;
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 284142780..b98aef9d4 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -30,6 +30,7 @@ bool IfPm3FpcUsart(void);
 bool IfPm3FpcUsartHost(void);
 bool IfPm3FpcUsartHostFromUsb(void);
 bool IfPm3FpcUsartDevFromUsb(void);
+bool IfPm3FpcUsartFromUsb(void);
 bool IfPm3Lf(void);
 bool IfPm3Hitag(void);
 bool IfPm3Hfsniff(void);