Clearing the Now playing queue automatically

[Andy L]

Is there a way to clear the Now playing queue automatically once the last song in it has finished playing? If not, could this functionality be added? I have Keep played songs set to 'Remove all played songs' in Settings -> Playback but this doesn't seem to do anything. I only want to clear the queue once all tracks in the queue have finished playing and not as each song is played so the 'Remove played songs' option isn't quite what I'm looking for.