diff --git a/os/hal/src/hal_mac.c b/os/hal/src/hal_mac.c
index e03a58f0f..e2813607d 100644
--- a/os/hal/src/hal_mac.c
+++ b/os/hal/src/hal_mac.c
@@ -157,8 +157,7 @@ msg_t macWaitTransmitDescriptor(MACDriver *macp,
 
   osalSysLock();
 
-  while (((msg = mac_lld_get_transmit_descriptor(macp, tdp)) != MSG_OK) &&
-         (timeout > (sysinterval_t)0)) {
+  while ((msg = mac_lld_get_transmit_descriptor(macp, tdp)) != MSG_OK) {
     msg = osalThreadEnqueueTimeoutS(&macp->tdqueue, timeout);
     if (msg == MSG_TIMEOUT) {
       break;
diff --git a/readme.txt b/readme.txt
index e1664bb3a..f69297b7d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -93,7 +93,9 @@
        MEMS Accelerometers.
 - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1).
 - NEW: Added latency measurement test application.
-- FIX: Schedule anomaly when CH_CFG_TIME_QUANTUM is greater than zero
+- FIX: Fixed extra condition in MAC driver macWaitTransmitDescriptor() function
+       (bug #1106)(backported to 20.3.2)(backported to 19.1.5).
+- FIX: Fixed schedule anomaly when CH_CFG_TIME_QUANTUM is greater than zero
        (bug #1105)(backported to 20.3.2)(backported to 19.1.5).
 - FIX: Fixed Virtual Timers corner case (bug #1104)
        (backported to 20.3.2)(backported to 19.1.5).