diff --git a/homeassistant/components/light/hue.py b/homeassistant/components/light/hue.py
index 6b4908b02d4..9f662718514 100644
--- a/homeassistant/components/light/hue.py
+++ b/homeassistant/components/light/hue.py
@@ -245,12 +245,9 @@ class HueLight(Light):
         mode = self._color_mode
         source = self.light.action if self.is_group else self.light.state
 
-        if mode == 'xy' and 'xy' in source:
+        if mode in ('xy', 'hs'):
             return color.color_xy_to_hs(*source['xy'])
 
-        if mode == 'hs' and 'hue' in source and 'sat' in source:
-            return source['hue'] / 65535 * 360, source['sat'] / 255 * 100
-
         return None
 
     @property
diff --git a/tests/components/light/test_hue.py b/tests/components/light/test_hue.py
index d36548e1e91..8f5b52ea6de 100644
--- a/tests/components/light/test_hue.py
+++ b/tests/components/light/test_hue.py
@@ -650,19 +650,6 @@ def test_hs_color():
 
     assert light.hs_color is None
 
-    light = hue_light.HueLight(
-        light=Mock(state={
-            'colormode': 'hs',
-            'hue': 1234,
-            'sat': 123,
-        }),
-        request_bridge_update=None,
-        bridge=Mock(),
-        is_group=False,
-    )
-
-    assert light.hs_color == (1234 / 65535 * 360, 123 / 255 * 100)
-
     light = hue_light.HueLight(
         light=Mock(state={
             'colormode': 'xy',