fix: guard sort() with shuffle check so --shuffle is not silently ign…

fix: guard sort() with shuffle check so --shuffle is not silently ign… #7059