diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index e03c490616ef3f40218159ef4aaa5833df9048f5..5ef014ba6ae86917f34e6ebbd855845e3bf71732 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -836,6 +836,7 @@ static int uas_slave_configure(struct scsi_device *sdev)
 	if (devinfo->flags & US_FL_BROKEN_FUA)
 		sdev->broken_fua = 1;
 
+	scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
 	return 0;
 }