diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
index 61f4b025..12bf00f2 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
@@ -130,7 +130,7 @@ public class SmartHomeImpl extends SmartHomeApp implements OAuth2TokenRegistrati
                                             .setName(device.getName())
                                             .build())
                             .setWillReportState(true)
-                            //.setRoomHint(sensor.getRoom().getName())
+                            .setRoomHint((device.getRoom() != null ? device.getRoom().getName() : ""))
                             .setDeviceInfo(
                                     DeviceProto.DeviceInfo.newBuilder()
                                             //.setManufacturer((String) device.get("manufacturer"))