diff --git a/Telegram/SourceFiles/media/audio/media_audio_loaders.cpp b/Telegram/SourceFiles/media/audio/media_audio_loaders.cpp
index 82c0041a35..b249f277c9 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_loaders.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_loaders.cpp
@@ -194,7 +194,7 @@ void Loaders::loadData(AudioMsgId audio, crl::time positionMs) {
 			errAtStart = false;
 		} else if (res == Result::Wait) {
 			waiting = (samples.size() < kPlaybackBufferSize)
-				&& !l->forceToBuffer();
+				&& (!samplesCount || !l->forceToBuffer());
 			if (waiting) {
 				l->saveDecodedSamples(&samples, &samplesCount);
 			}