diff --git a/block/blk-flush.c b/block/blk-flush.c
index 022a2bbb012d7cfa53fff946734776838303abf6..c1bfcde165af5ae993faa73d890bc8fb06ad9b54 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -245,8 +245,10 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
 		 * avoiding use-after-free.
 		 */
 		WRITE_ONCE(flush_rq->state, MQ_RQ_IDLE);
-		if (fq->rq_status != BLK_STS_OK)
+		if (fq->rq_status != BLK_STS_OK) {
 			error = fq->rq_status;
+			fq->rq_status = BLK_STS_OK;
+		}
 
 		hctx = blk_mq_map_queue(q, flush_rq->mq_ctx->cpu);
 		if (!q->elevator) {