diff --git a/sys/applemedia/avfvideosrc.m b/sys/applemedia/avfvideosrc.m
index 236aa75508..3c570b1a68 100644
--- a/sys/applemedia/avfvideosrc.m
+++ b/sys/applemedia/avfvideosrc.m
@@ -601,7 +601,8 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
 
 - (void)waitForQueueToDrain:(dispatch_queue_t)dispatchQueue
 {
-  dispatch_sync (dispatchQueue, ^{});
+  if (dispatchQueue != dispatch_get_current_queue())
+      dispatch_sync (dispatchQueue, ^{});
 }
 
 @end