diff --git a/homeassistant/components/media_player/yamaha.py b/homeassistant/components/media_player/yamaha.py
index 101dfc2bc53..0bb34aee7e1 100644
--- a/homeassistant/components/media_player/yamaha.py
+++ b/homeassistant/components/media_player/yamaha.py
@@ -185,9 +185,10 @@ class YamahaDevice(MediaPlayerDevice):
         self._playback_support = self.receiver.get_playback_support()
         self._is_playback_supported = self.receiver.is_playback_supported(
             self._current_source)
-        if self._zone == "Main_Zone":
+        surround_programs = self.receiver.surround_programs()
+        if surround_programs:
             self._sound_mode = self.receiver.surround_program
-            self._sound_mode_list = self.receiver.surround_programs()
+            self._sound_mode_list = surround_programs
         else:
             self._sound_mode = None
             self._sound_mode_list = None