diff --git a/devices/protocols/Aqara/xaal/aqara/devices.py b/devices/protocols/Aqara/xaal/aqara/devices.py
index 734e5f1e1c9439100c3b1a4967cd49a06e2f8db3..4ca09c5eb078b1f49464e703d60d010b87dbbf6e 100644
--- a/devices/protocols/Aqara/xaal/aqara/devices.py
+++ b/devices/protocols/Aqara/xaal/aqara/devices.py
@@ -419,8 +419,10 @@ class Gateway(AqaraDev):
             hsv = _hsv
         h,s,v = hsv
         rgb=tuple(round(i * 255) for i in colorsys.hsv_to_rgb(h/360.0,s,v))
-        brightness = self.devices[0].attributes['brightness']
-        brightness = int(brightness * 0xff / 100)
+        if self.rgb:
+            brightness = self.value_to_rgb(self.rgb)[3]
+        else:
+            brightness = 0xFF
         value= self.rgb_to_value(*rgb,brightness)
         self.lamp_set(value)