diff --git a/src/input/ThreadInputStream.cxx b/src/input/ThreadInputStream.cxx
index 5491cb4ed..dbe3be20b 100644
--- a/src/input/ThreadInputStream.cxx
+++ b/src/input/ThreadInputStream.cxx
@@ -149,5 +149,5 @@ ThreadInputStream::IsEOF() const noexcept
 {
 	assert(!thread.IsInside());
 
-	return eof;
+	return eof && buffer.empty();
 }