diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 806c63091..9852b15d5 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -20,6 +20,7 @@
 #include "ticks.h"
 #include "dbprint.h"
 #include "util.h"
+#include "util.h"
 #include "parity.h"
 #include "mifareutil.h"
 #include "commonutil.h"
@@ -1979,9 +1980,11 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
     for (;;) {
         WDT_HIT();
 
-        if (check == 2000) {
-            if (BUTTON_PRESS())
+        if (check == 1000) {
+            if (BUTTON_PRESS() || data_available()) {
+                Dbprintf("----------- " _GREEN_("BREAKING") " ----------");
                 return 1;
+            }
             check = 0;
         }
         ++check;
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 4eaf711b3..bba3132a7 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -535,8 +535,9 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain, uint1
 
         WDT_HIT();
 
-        if (counter == 2000) {
+        if (counter == 1000) {
             if (data_available()) {
+                Dbprintf("----------- " _GREEN_("BREAKING") " ----------");
                 break;
             }
             counter = 0;