diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 99aeca262..2a9636496 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1520,6 +1520,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         case CMD_CAPABILITIES:
             SendCapabilities();
+            break;
         case CMD_PING:
             reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             break;
diff --git a/client/comms.c b/client/comms.c
index c48a1bcdd..1fb59757b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -608,7 +608,7 @@ int TestProxmark(void) {
             return PM3_EIO;
 
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
-        if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
+        if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false)) {
             memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
             conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
             conn.uart_speed = pm3_capabilities.baudrate;