diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bb7272c85..65233d718 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -319,7 +319,9 @@ void MeasureAntennaTuningHf(void) {
         DbprintfEx(FLAG_INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    Dbprintf("\n[+] cancelled", 1);
+    DbprintfEx(FLAG_NEWLINE, "");
+    Dbprintf("[+] cancelled", 1);
+    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EOPABORTED, NULL, 0);
 }
 
 void ReadMem(int addr) {
diff --git a/client/cmdhf.c b/client/cmdhf.c
index ab34e39fc..40bd863cb 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -85,8 +85,15 @@ int CmdHFTune(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
     clearCommandBuffer();
-    SendCommandOLD(CMD_MEASURE_ANTENNA_TUNING_HF, 0, 0, 0, NULL, 0);
-    return 0;
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, NULL, 0);
+    PacketResponseNG resp;
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
+        return PM3_ETIMEOUT;
+    }
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 int CmdHFSniff(const char *Cmd) {