diff --git a/src/emucore/tia/DelayQueue.hxx b/src/emucore/tia/DelayQueue.hxx
index 6d3453e70..d2d3ce069 100644
--- a/src/emucore/tia/DelayQueue.hxx
+++ b/src/emucore/tia/DelayQueue.hxx
@@ -83,7 +83,7 @@ void DelayQueue<length, capacity>::push(uInt8 address, uInt8 value, uInt8 delay)
 
   uInt8 currentIndex = myIndices[address];
 
-  if (currentIndex < 0xFF)
+  if (currentIndex < length)
     myMembers[currentIndex].remove(address);
 
   uInt8 index = smartmod<length>(myIndex + delay);