diff --git a/homeassistant/components/media_player/universal.py b/homeassistant/components/media_player/universal.py
index 18b953a0372..a0c99dbec45 100644
--- a/homeassistant/components/media_player/universal.py
+++ b/homeassistant/components/media_player/universal.py
@@ -333,8 +333,7 @@ class UniversalMediaPlayer(MediaPlayerDevice):
         if any([cmd in self._cmds for cmd in [SERVICE_VOLUME_UP,
                                               SERVICE_VOLUME_DOWN]]):
             flags |= SUPPORT_VOLUME_STEP
-            flags &= ~SUPPORT_VOLUME_SET
-        elif SERVICE_VOLUME_SET in self._cmds:
+        if SERVICE_VOLUME_SET in self._cmds:
             flags |= SUPPORT_VOLUME_SET
 
         if SERVICE_VOLUME_MUTE in self._cmds and \
diff --git a/tests/components/media_player/test_universal.py b/tests/components/media_player/test_universal.py
index 58911776836..ee86735a063 100644
--- a/tests/components/media_player/test_universal.py
+++ b/tests/components/media_player/test_universal.py
@@ -584,7 +584,8 @@ class TestMediaPlayer(unittest.TestCase):
 
         check_flags = universal.SUPPORT_TURN_ON | universal.SUPPORT_TURN_OFF \
             | universal.SUPPORT_VOLUME_STEP | universal.SUPPORT_VOLUME_MUTE \
-            | universal.SUPPORT_SELECT_SOURCE | universal.SUPPORT_SHUFFLE_SET
+            | universal.SUPPORT_SELECT_SOURCE | universal.SUPPORT_SHUFFLE_SET \
+            | universal.SUPPORT_VOLUME_SET
 
         assert check_flags == ump.supported_features