diff --git a/net/ipv4/tcp_comp.c b/net/ipv4/tcp_comp.c
index e7f6094b5aeec25f2893dba906f4b143033101a5..f6ebe52f3f7f77c25b2914b1dc0b5c7789651b7f 100644
--- a/net/ipv4/tcp_comp.c
+++ b/net/ipv4/tcp_comp.c
@@ -723,8 +723,6 @@ static int tcp_comp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 		if (!ctx->rx.decompressed) {
 			err = tcp_comp_decompress(sk, skb);
 			if (err < 0) {
-				if (err != -ENOSPC)
-					tcp_comp_err_abort(sk, EBADMSG);
 				goto recv_end;
 			}
 			ctx->rx.decompressed = true;
@@ -758,6 +756,9 @@ bool comp_stream_read(const struct sock *sk)
 {
 	struct tcp_comp_context *ctx = comp_get_ctx(sk);
 
+	if (!ctx)
+		return false;
+
 	if (ctx->rx.pkt)
 		return true;