Fix roomservice

Change-Id: I8c0bca788fa2fefee75be1467db6b84d05ee2091