Correctly handle handover of setup states