diff --git a/armsrc/hfops.c b/armsrc/hfops.c
index a48b8eebd..6a97be76a 100644
--- a/armsrc/hfops.c
+++ b/armsrc/hfops.c
@@ -234,7 +234,7 @@ int HfSimulateTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout) {
 
         WDT_HIT();
 
-        if (startTime > 0 && startTime + timeout < GetTickCount())
+        if (timeout > 0 && startTime + timeout < GetTickCount())
             break;
 
         // in mV
diff --git a/client/src/cmdhftexkom.c b/client/src/cmdhftexkom.c
index ddb9100bd..fee7fca97 100644
--- a/client/src/cmdhftexkom.c
+++ b/client/src/cmdhftexkom.c
@@ -574,7 +574,7 @@ static int CmdHFTexkomReader(const char *Cmd) {
 
     if (cm) {
         PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " to exit");
-        return read_texkom_uid(cm, true);
+        return read_texkom_uid(cm, verbose);
     }
 
     uint32_t samplesCount = 30000;