diff --git a/src/lib/chromaprint/DecoderClient.hxx b/src/lib/chromaprint/DecoderClient.hxx
index 8d2aa6a21..041ba194a 100644
--- a/src/lib/chromaprint/DecoderClient.hxx
+++ b/src/lib/chromaprint/DecoderClient.hxx
@@ -71,7 +71,7 @@ public:
 		   bool seekable, SignedSongTime duration) noexcept override;
 
 	DecoderCommand GetCommand() noexcept override {
-		return !error && remaining_bytes > 0
+		return !error && (!ready || remaining_bytes > 0)
 			? DecoderCommand::NONE
 			: DecoderCommand::STOP;
 	}