diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index d387bef07fcce7bb529ff7d8e56ce7e3f62d7fcb..5583dc4ff9415a68f36e58066b26d3ca451a3265 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1470,6 +1470,7 @@ static int nbd_dev_add(int index)
 	disk->queue->limits.discard_granularity = 512;
 	blk_queue_max_discard_sectors(disk->queue, UINT_MAX);
 	blk_queue_max_segment_size(disk->queue, UINT_MAX);
+	blk_queue_max_segments(disk->queue, USHRT_MAX);
 	blk_queue_max_hw_sectors(disk->queue, 65536);
 	disk->queue->limits.max_sectors = 256;