Fix roomservice

Change-Id: I3bd1f8ef34cd73a78a9b0e2e2c5e8559b3bc954f