diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index a05a3d7d5..38a9b72dc 100644
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -393,7 +393,7 @@ void TlsStream::CloseInternal(bool inDestructor)
 
 bool TlsStream::IsEof() const
 {
-	return m_Eof;
+	return m_Eof && m_RecvQ->GetAvailableBytes() < 1u;
 }
 
 bool TlsStream::SupportsWaiting() const