QUEUE DOESN'T SHUFFLE

[BOTSANDMAGIC]

Hey guys! Up until last year I could add my whole playlist (500+ songs) to the queue and be able to shuffle them as much as I like until I got a starting mix I liked. Now the shuffle button does nothing in YTM QUEUE unless I have less than 50 songs!? Does anyone have a fix for this? Using the shuffle feature only loads about 40 songs at a time and doesn't let me have the control I need. Thanks!