diff --git a/homeassistant/components/light/lifx.py b/homeassistant/components/light/lifx.py
index 36370242924..bc8b752f788 100644
--- a/homeassistant/components/light/lifx.py
+++ b/homeassistant/components/light/lifx.py
@@ -197,11 +197,6 @@ class LIFXLight(Light):
         else:
             fade = 0
 
-        if ATTR_BRIGHTNESS in kwargs:
-            brightness = kwargs[ATTR_BRIGHTNESS] * (BYTE_MAX + 1)
-        else:
-            brightness = self._bri
-
         if ATTR_RGB_COLOR in kwargs:
             hue, saturation, brightness = \
                 convert_rgb_to_hsv(kwargs[ATTR_RGB_COLOR])
@@ -210,6 +205,11 @@ class LIFXLight(Light):
             saturation = self._sat
             brightness = self._bri
 
+        if ATTR_BRIGHTNESS in kwargs:
+            brightness = kwargs[ATTR_BRIGHTNESS] * (BYTE_MAX + 1)
+        else:
+            brightness = self._bri
+
         if ATTR_COLOR_TEMP in kwargs:
             kelvin = int(((TEMP_MAX - TEMP_MIN) *
                           (kwargs[ATTR_COLOR_TEMP] - TEMP_MIN_HASS) /