diff --git a/block/elevator.c b/block/elevator.c
index 4bb2f0c93fa6..b7a257d14c4a 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -228,8 +228,7 @@ int elevator_init(struct request_queue *q, char *name)
 		 * to "none".
 		 */
 		if (q->mq_ops) {
-			if (q->nr_hw_queues == 1)
-				e = elevator_get("mq-deadline", false);
+			e = elevator_get("bfq", false);
 			if (!e)
 				return 0;
 		} else