diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 11f2ca66b..bcd898c89 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1583,10 +1583,20 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 
     volatile uint8_t b;
     uint16_t c = 0;
+    uint32_t sendtimer = GetTickCount();
+    uint32_t cntr = 0;
     while (c < len) {
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c++];
+            cntr = 0;
+        } else {
+            if (cntr++ > 1000) {
+                cntr = 0;
+                if (GetTickCount() - sendtimer > 100)
+                    break;
+            }
         }
+        
         //iceman test
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
@@ -1945,6 +1955,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
     (void)b;
 
     uint32_t timeout = iso14a_get_timeout();
+    uint32_t receive_timer = GetTickCount();
     for (;;) {
         WDT_HIT();
 
@@ -1957,7 +1968,12 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
                 return false;
             }
         }
+        
+        // timeout already in ms + 100ms guard time
+        if (GetTickCount() - receive_timer > timeout + 100)
+            break;
     }
+    return false;
 }
 
 void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing) {