diff --git a/Audio/Output/OutputCoreAudio.m b/Audio/Output/OutputCoreAudio.m
index c2b3f915e..d74a00069 100644
--- a/Audio/Output/OutputCoreAudio.m
+++ b/Audio/Output/OutputCoreAudio.m
@@ -825,6 +825,10 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 
 - (void)dealloc {
 	[self stop];
+	// In case stop called on another thread first
+	while(!stopCompleted) {
+		usleep(500);
+	}
 }
 
 - (void)pause {