Fix for lock and unlock after room change