diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 7d29da0ee..257a4a5b6 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -343,7 +343,7 @@ void SendStatus(void) {
     Flashmem_print_info();
 #endif
 
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_ng(CMD_STATUS, PM3_SUCCESS, NULL, 0);
 }
 
 void SendCapabilities(void) {
diff --git a/client/cmdhw.c b/client/cmdhw.c
index c81efda9e..c363fdc25 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -502,7 +502,7 @@ static int CmdStatus(const char *Cmd) {
     clearCommandBuffer();
     PacketResponseNG resp;
     SendCommandNG(CMD_STATUS, NULL, 0);
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
+    if (WaitForResponseTimeout(CMD_STATUS, &resp, 2000) == false)
         PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out");
     return PM3_SUCCESS;
 }