diff --git a/block/blk-core.c b/block/blk-core.c
index 8658ad84834b1e597a19011f28463e9bdbdaaf13..a7747ed9c7672dbb4883efcf6c171d368e8ae2b9 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2302,6 +2302,9 @@ generic_make_request_checks(struct bio *bio)
 		}
 	}
 
+	if (!test_bit(QUEUE_FLAG_POLL, &q->queue_flags))
+		bio->bi_opf &= ~REQ_HIPRI;
+
 	switch (bio_op(bio)) {
 	case REQ_OP_DISCARD:
 		if (!blk_queue_discard(q))