diff --git a/stepmania/src/RageSoundReader_Resample_Good.cpp b/stepmania/src/RageSoundReader_Resample_Good.cpp
index ac32fad6af..123fe7761f 100644
--- a/stepmania/src/RageSoundReader_Resample_Good.cpp
+++ b/stepmania/src/RageSoundReader_Resample_Good.cpp
@@ -349,7 +349,7 @@ int PolyphaseFilter::ReadBuffer( State &State, float *pOut, int iSamplesOut ) co
 {
 	float *pOutOrig = pOut;
 	
-	while( State.m_iFilled )
+	while( State.m_iFilled && iSamplesOut-- )
 	{
 		*pOut = State.m_fBuf[State.m_iBufNext];
 		++pOut;