diff --git a/src/lib-compression/istream-bzlib.c b/src/lib-compression/istream-bzlib.c
index f9c913cffe..bb304ca367 100644
--- a/src/lib-compression/istream-bzlib.c
+++ b/src/lib-compression/istream-bzlib.c
@@ -106,7 +106,7 @@ static ssize_t i_stream_bzlib_read(struct istream_private *stream)
 		} else {
 			i_assert(stream->parent->eof);
 			bzlib_read_error(zstream, "unexpected EOF");
-			stream->istream.stream_errno = EINVAL;
+			stream->istream.stream_errno = EPIPE;
 		}
 		return -1;
 	}
diff --git a/src/lib-compression/istream-lz4.c b/src/lib-compression/istream-lz4.c
index a134084da6..dc27447915 100644
--- a/src/lib-compression/istream-lz4.c
+++ b/src/lib-compression/istream-lz4.c
@@ -139,7 +139,7 @@ static ssize_t i_stream_lz4_read(struct istream_private *stream)
 	if (zstream->chunk_left > 0) {
 		if (ret == -1 && zstream->istream.parent->stream_errno == 0) {
 			lz4_read_error(zstream, "truncated lz4 chunk");
-			stream->istream.stream_errno = EINVAL;
+			stream->istream.stream_errno = EPIPE;
 			return -1;
 		}
 		zstream->istream.istream.stream_errno =