diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m
index 5ae201bd4..7ae011918 100644
--- a/Audio/Chain/ConverterNode.m
+++ b/Audio/Chain/ConverterNode.m
@@ -101,11 +101,12 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
 			chunk = [self convert];
 		}
 		if(!chunk) {
-			if(paused) {
-				continue;
-			} else if(!streamFormatChanged) {
+			if([self endOfStream] == YES) {
 				break;
 			}
+			if(paused || !streamFormatChanged) {
+				continue;
+			}
 		} else {
 			@autoreleasepool {
 				[self writeChunk:chunk];