diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp
index b80f23f9cd..b1bd601c11 100644
--- a/src/core/audiosource.cpp
+++ b/src/core/audiosource.cpp
@@ -305,10 +305,10 @@ void FFMS_AudioSource::DecodeNextBlock(CacheIterator *pos) {
 		// during indexing, so continue to just ignore decoding errors
 		if (Ret < 0) break;
 
-		if (Ret > 0 && GotFrame) {
+		if (Ret > 0) {
 			Packet.size -= Ret;
 			Packet.data += Ret;
-			if (DecodeFrame->nb_samples > 0) {
+			if (GotFrame && DecodeFrame->nb_samples > 0) {
 				GotSamples = true;
 				if (pos)
 					CacheBlock(*pos);