Improved room state handling