diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index d9ec71c460b..7c8a01407ac 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -252,8 +252,7 @@ def setup(hass, config):
 
             # Without this check, a ctcolor with value '99' would work
             # These values are based on Philips Hue, may need ajustment later
-            if isinstance(colortemp, int):
-                if 154 <= colortemp <= 500:
+            if isinstance(colortemp, int) and 154 <= colortemp <= 500:
                     params[ATTR_COLOR_TEMP] = colortemp
 
         if ATTR_RGB_COLOR in dat:
diff --git a/homeassistant/components/light/demo.py b/homeassistant/components/light/demo.py
index 76ac07a0073..d12a288ccc3 100644
--- a/homeassistant/components/light/demo.py
+++ b/homeassistant/components/light/demo.py
@@ -16,7 +16,7 @@ LIGHT_COLORS = [
     [0.460, 0.470],
 ]
 
-LIGHT_TEMPS = [160, 300, 500]
+LIGHT_TEMPS = [160, 500]
 
 
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):