diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 4847a8f8fac8..2cb9b58d04dd 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -783,7 +783,7 @@ static bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data, s32 res,
 		WRITE_ONCE(cqe->res, res);
 		WRITE_ONCE(cqe->flags, cflags);
 
-		if (cqe32) {
+		if (cqe32 || (ctx->flags & IORING_SETUP_CQE32)) {
 			WRITE_ONCE(cqe->big_cqe[0], 0);
 			WRITE_ONCE(cqe->big_cqe[1], 0);
 		}