diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index a214c95f071ad646df352fe3723ff925df352ea9..c15e2c112ea8a2a2de0422486e41be5a31598a70 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -4867,18 +4867,6 @@ static void bfq_finish_requeue_request(struct request *rq)
 	struct bfq_queue *bfqq = RQ_BFQQ(rq);
 	struct bfq_data *bfqd;
 
-	/*
-	 * Requeue and finish hooks are invoked in blk-mq without
-	 * checking whether the involved request is actually still
-	 * referenced in the scheduler. To handle this fact, the
-	 * following two checks make this function exit in case of
-	 * spurious invocations, for which there is nothing to do.
-	 *
-	 * First, check whether rq has nothing to do with an elevator.
-	 */
-	if (unlikely(!(rq->rq_flags & RQF_ELVPRIV)))
-		return;
-
 	/*
 	 * rq either is not associated with any icq, or is an already
 	 * requeued request that has not (yet) been re-inserted into
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index fe660764b8d13352371d973a67ea670b74023866..011445f7852bfe63214920f617c3a4ba35ca061c 100644
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -72,7 +72,7 @@ static inline void blk_mq_sched_requeue_request(struct request *rq)
 	struct request_queue *q = rq->q;
 	struct elevator_queue *e = q->elevator;
 
-	if (e && e->type->ops.mq.requeue_request)
+	if ((rq->rq_flags & RQF_ELVPRIV) && e && e->type->ops.mq.requeue_request)
 		e->type->ops.mq.requeue_request(rq);
 }