diff --git a/tb/arp_ep.py b/tb/arp_ep.py
index 977cf1411..2a4286dda 100644
--- a/tb/arp_ep.py
+++ b/tb/arp_ep.py
@@ -263,6 +263,7 @@ class ARPFrameSink():
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/baser_serdes_ep.py b/tb/baser_serdes_ep.py
index 0c085bb05..4d0732f3b 100644
--- a/tb/baser_serdes_ep.py
+++ b/tb/baser_serdes_ep.py
@@ -375,6 +375,7 @@ class BaseRSerdesSink(object):
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/eth_ep.py b/tb/eth_ep.py
index f7dd3f1a3..fbac99aa9 100644
--- a/tb/eth_ep.py
+++ b/tb/eth_ep.py
@@ -241,6 +241,7 @@ class EthFrameSink():
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/gmii_ep.py b/tb/gmii_ep.py
index e4ff42925..d79570b71 100644
--- a/tb/gmii_ep.py
+++ b/tb/gmii_ep.py
@@ -193,6 +193,7 @@ class GMIISink(object):
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/ip_ep.py b/tb/ip_ep.py
index 4afcaea26..252f4aa3f 100644
--- a/tb/ip_ep.py
+++ b/tb/ip_ep.py
@@ -383,6 +383,7 @@ class IPFrameSink():
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/mii_ep.py b/tb/mii_ep.py
index 64c4a09b9..bcbff030d 100644
--- a/tb/mii_ep.py
+++ b/tb/mii_ep.py
@@ -201,6 +201,7 @@ class MIISink(object):
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/udp_ep.py b/tb/udp_ep.py
index 0a3d156c5..3993c99ce 100644
--- a/tb/udp_ep.py
+++ b/tb/udp_ep.py
@@ -476,6 +476,7 @@ class UDPFrameSink():
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout:
diff --git a/tb/xgmii_ep.py b/tb/xgmii_ep.py
index 6191cb32a..6b5247643 100644
--- a/tb/xgmii_ep.py
+++ b/tb/xgmii_ep.py
@@ -258,6 +258,7 @@ class XGMIISink(object):
         return not self.queue
 
     def wait(self, timeout=0):
+        yield delay(0)
         if self.queue:
             return
         if timeout: