Fix room disconnection logic

[blchelle]

##Description
Disconnecting from a room is a little bit flaky and could be improved as of now. I don't have all the details so add them below if you have anything else of note.