diff --git a/sc2/src/sc2code/libs/sound/decoders/decoder.c b/sc2/src/sc2code/libs/sound/decoders/decoder.c
index 4f7ca17d8..ebb78ead6 100644
--- a/sc2/src/sc2code/libs/sound/decoders/decoder.c
+++ b/sc2/src/sc2code/libs/sound/decoders/decoder.c
@@ -415,6 +415,12 @@ uint32 SoundDecoder_Decode (TFB_SoundDecoder *decoder)
 			else
 				buffer_size = decoder->buffer_size;
 
+			if (buffer_size == 0)
+			{	// nothing more to decode
+				decoder->error = SOUNDDECODER_EOF;
+				return 0;
+			}
+
 			while (decoded_bytes < buffer_size)
 			{	
 				/* Produce output in requested byte-order */