diff --git a/block/elevator.c b/block/elevator.c
index bcba2dd5cb5c0812b76d2aaf2afff48ee0e207e6..ef7f59469acc7f313d3444545c9c5835efe81cc7 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -230,10 +230,6 @@ int elevator_init(struct request_queue *q, char *name)
 			printk(KERN_ERR
 				"Default I/O scheduler not found. " \
 				"Using noop/none.\n");
-			if (q->mq_ops) {
-				elevator_put(e);
-				return 0;
-			}
 			e = elevator_get("noop", false);
 		}
 	}