diff --git a/src/sound/mididevices/music_timiditypp_mididevice.cpp b/src/sound/mididevices/music_timiditypp_mididevice.cpp
index 42733ce38..a254776ec 100644
--- a/src/sound/mididevices/music_timiditypp_mididevice.cpp
+++ b/src/sound/mididevices/music_timiditypp_mididevice.cpp
@@ -692,6 +692,10 @@ bool TimidityPPMIDIDevice::FillStream(SoundStream *stream, void *buff, int len,
 			}
 			break;
 		}
+		else if (r == 0 && errno != 0)
+		{
+			break;
+		}
 		got += r;
 	} while(got < len);
 	if(got < len)