diff --git a/Audio/Output/OutputCoreAudio.m b/Audio/Output/OutputCoreAudio.m
index 65052fb14..7eaef4f03 100644
--- a/Audio/Output/OutputCoreAudio.m
+++ b/Audio/Output/OutputCoreAudio.m
@@ -221,21 +221,10 @@ default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const
         }
         
         if ([outputController shouldReset]) {
-            size_t length = [[outputController buffer] bufferedLength];
             [[outputController buffer] empty];
             [outputController setShouldReset:NO];
-            NSArray * delayedCopy = [delayedEvents copy];
             [delayedEvents removeAllObjects];
-            for (NSNumber * eventOffset in delayedCopy) {
-                long eventTimestamp = [eventOffset longValue];
-                if (eventTimestamp >= length) {
-                    eventTimestamp -= length;
-                }
-                else {
-                    eventTimestamp = 0;
-                }
-                [delayedEvents addObject:[NSNumber numberWithLong:eventTimestamp]];
-            }
+            delayedEventsPopped = YES;
         }
 
         while ([delayedEvents count]) {