Fix roomservice

Change-Id: Ie6eec848ed0384f15c3467f25e51a3cc2b11e9fe