diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 6ee75b8c1..b4daed774 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1251,20 +1251,13 @@ int lf_hid_watch(int findone, uint32_t *high, uint32_t *low) {
     BigBuf_Clear_keep_EM();
 
     int res = PM3_SUCCESS;
-    uint16_t interval = 0;
-    while (BUTTON_PRESS() == false) {
+    for (;;) {
 
         WDT_HIT();
 
-        // cancel w usb command.
-        if (interval == 4000) {
-            if (data_available()) {
-                res = PM3_EOPABORTED;
-                break;
-            }
-            interval = 0;
-        } else {
-            interval++;
+        if (data_available() || BUTTON_PRESS()) {
+            res = PM3_EOPABORTED;
+            break;
         }
 
         DoAcquisition_default(-1, false);
@@ -1360,20 +1353,13 @@ int lf_awid_watch(int findone, uint32_t *high, uint32_t *low) {
     LFSetupFPGAForADC(LF_DIVISOR_125, true);
 
     int res = PM3_SUCCESS;
-    uint16_t interval = 0;
-    while (BUTTON_PRESS() == false) {
+    for (;;) {
 
         WDT_HIT();
 
-        // cancel w usb command.
-        if (interval == 4000) {
-            if (data_available()) {
-                res = PM3_EOPABORTED;
-                break;
-            }
-            interval = 0;
-        } else {
-            interval++;
+        if (data_available() || BUTTON_PRESS()) {
+            res = PM3_EOPABORTED;
+            break;
         }
 
         DoAcquisition_default(-1, false);
@@ -1465,19 +1451,12 @@ int lf_em410x_watch(int findone, uint32_t *high, uint64_t *low) {
     LFSetupFPGAForADC(LF_DIVISOR_125, true);
 
     int res = PM3_SUCCESS;
-    uint16_t interval = 0;
-    while (BUTTON_PRESS() == false) {
+    for (;;) {
         WDT_HIT();
 
-        // cancel w usb command.
-        if (interval == 4000) {
-            if (data_available()) {
-                res = PM3_EOPABORTED;
-                break;
-            }
-            interval = 0;
-        } else {
-            interval++;
+        if (data_available() || BUTTON_PRESS()) {
+            res = PM3_EOPABORTED;
+            break;
         }
 
         DoAcquisition_default(-1, false);
@@ -1541,20 +1520,13 @@ int lf_io_watch(int findone, uint32_t *high, uint32_t *low) {
     LFSetupFPGAForADC(LF_DIVISOR_125, true);
 
     int res = PM3_SUCCESS;
-    uint16_t interval = 0;
-    while (BUTTON_PRESS() == false) {
+    for (;;) {
 
         WDT_HIT();
 
-        // cancel w usb command.
-        if (interval == 4000) {
-            if (data_available()) {
-                res = PM3_EOPABORTED;
-                break;
-            }
-            interval = 0;
-        } else {
-            interval++;
+        if (data_available() || BUTTON_PRESS()) {
+            res = PM3_EOPABORTED;
+            break;
         }
 
         DoAcquisition_default(-1, false);
diff --git a/client/src/cmdlfawid.c b/client/src/cmdlfawid.c
index 300f09430..1a06e72e2 100644
--- a/client/src/cmdlfawid.c
+++ b/client/src/cmdlfawid.c
@@ -129,10 +129,7 @@ static int CmdAWIDWatch(const char *Cmd) {
     PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
     clearCommandBuffer();
     SendCommandNG(CMD_LF_AWID_WATCH, NULL, 0);
-    PacketResponseNG resp;
-    WaitForResponse(CMD_LF_AWID_WATCH, &resp);
-    PrintAndLogEx(INFO, "Done");
-    return resp.status;
+    return lfsim_wait_check(CMD_LF_AWID_WATCH);
 }
 
 //by marshmellow
diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c
index c836bcd01..5587017d2 100644
--- a/client/src/cmdlfem410x.c
+++ b/client/src/cmdlfem410x.c
@@ -287,13 +287,9 @@ static int CmdEM410xWatch(const char *Cmd) {
     CLIParserFree(ctx);
 
     PrintAndLogEx(SUCCESS, "Watching for EM410x cards - place tag on antenna");
-    PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
     clearCommandBuffer();
     SendCommandNG(CMD_LF_EM410X_WATCH, NULL, 0);
-    PacketResponseNG resp;
-    WaitForResponse(CMD_LF_EM410X_WATCH, &resp);
-    PrintAndLogEx(INFO, "Done");
-    return resp.status;
+    return lfsim_wait_check(CMD_LF_EM410X_WATCH);
 }
 
 //by marshmellow
diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c
index 76dd36177..4550127be 100644
--- a/client/src/cmdlfhid.c
+++ b/client/src/cmdlfhid.c
@@ -223,10 +223,7 @@ static int CmdHIDWatch(const char *Cmd) {
     PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
     clearCommandBuffer();
     SendCommandNG(CMD_LF_HID_WATCH, NULL, 0);
-    PacketResponseNG resp;
-    WaitForResponse(CMD_LF_HID_WATCH, &resp);
-    PrintAndLogEx(INFO, "Done");
-    return resp.status;
+    return lfsim_wait_check(CMD_LF_HID_WATCH);
 }
 
 static int CmdHIDSim(const char *Cmd) {
diff --git a/client/src/cmdlfio.c b/client/src/cmdlfio.c
index fd9ce6d1d..3752522ad 100644
--- a/client/src/cmdlfio.c
+++ b/client/src/cmdlfio.c
@@ -50,10 +50,7 @@ static int CmdIOProxWatch(const char *Cmd) {
     PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
     clearCommandBuffer();
     SendCommandNG(CMD_LF_IO_WATCH, NULL, 0);
-    PacketResponseNG resp;
-    WaitForResponse(CMD_LF_IO_WATCH, &resp);
-    PrintAndLogEx(INFO, "Done");
-    return resp.status;
+    return lfsim_wait_check(CMD_LF_IO_WATCH);
 }
 
 //IO-Prox demod - FSK RF/64 with preamble of 000000001