Fix buffer preselection on reconnect