Make sure to only call disconnect CB when new buffer is in place