iTunes keeps adding shuffled tracks

I have a problem in iTunes 12.5.1.21 (current version)

If I play an Album, Up Next is populated by the alum tracks.

If I play an individual track, Up Next populates with a Shuffle from my entire Library.

Can I stop it doing this? Preferably it would populate with the next tracks in that album, or nothing.

Thanks

SGC