diff --git a/Audio/Chain/Node.m b/Audio/Chain/Node.m
index 8e9453678..8b2efb99d 100644
--- a/Audio/Chain/Node.m
+++ b/Audio/Chain/Node.m
@@ -96,17 +96,16 @@
 	void *readPtr;
 	int amountToCopy;
 	int availInput;
+    
+    if ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES)
+    {
+        endOfStream = YES;
+        return 0;
+    }
 	
 	[readLock lock];
 	availInput = [[previousNode buffer] lengthAvailableToReadReturningPointer:&readPtr];
 	
-	if (availInput < amount && [previousNode endOfStream] == YES)
-	{
-//		[previousNode release]; 
-		//If it is the outputNode, [soundController newInputChain];
-		//else
-		endOfStream = YES;
-	}
 /*	if (availInput <= 0) {
 		DLog(@"BUFFER RAN DRY!");
 	}