Fix issue where room data was not fully loaded