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

fix: guard sort() with shuffle check so --shuffle is not silently ignored #7056