diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
index e1dfb86a8f..862937c02e 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
@@ -234,6 +234,8 @@ void RageSound_Generic_Software::DecodeThread()
 				}
 
 				int iWrote = GetDataForSound( *pSound );
+				if( iWrote == RageSoundReader::WOULD_BLOCK )
+					break;
 				if( iWrote == RageSoundReader::END_OF_FILE )
 				{
 					/* This sound is finishing. */