diff --git a/homeassistant/components/yamaha/const.py b/homeassistant/components/yamaha/const.py
index 492babe9657..1cdb619b6ef 100644
--- a/homeassistant/components/yamaha/const.py
+++ b/homeassistant/components/yamaha/const.py
@@ -1,6 +1,7 @@
 """Constants for the Yamaha component."""
 
 DOMAIN = "yamaha"
+DISCOVER_TIMEOUT = 3
 KNOWN_ZONES = "known_zones"
 CURSOR_TYPE_DOWN = "down"
 CURSOR_TYPE_LEFT = "left"
diff --git a/homeassistant/components/yamaha/media_player.py b/homeassistant/components/yamaha/media_player.py
index f6434616cfa..58f501b99be 100644
--- a/homeassistant/components/yamaha/media_player.py
+++ b/homeassistant/components/yamaha/media_player.py
@@ -31,6 +31,7 @@ from .const import (
     CURSOR_TYPE_RIGHT,
     CURSOR_TYPE_SELECT,
     CURSOR_TYPE_UP,
+    DISCOVER_TIMEOUT,
     DOMAIN,
     KNOWN_ZONES,
     SERVICE_ENABLE_OUTPUT,
@@ -125,18 +126,33 @@ def _discovery(config_info):
     elif config_info.host is None:
         _LOGGER.debug("Config No Host Supplied Zones")
         zones = []
-        for recv in rxv.find():
+        for recv in rxv.find(DISCOVER_TIMEOUT):
             zones.extend(recv.zone_controllers())
     else:
         _LOGGER.debug("Config Zones")
         zones = None
 
         # Fix for upstream issues in rxv.find() with some hardware.
-        with contextlib.suppress(AttributeError):
-            for recv in rxv.find():
+        with contextlib.suppress(AttributeError, ValueError):
+            for recv in rxv.find(DISCOVER_TIMEOUT):
+                _LOGGER.debug(
+                    "Found Serial %s %s %s",
+                    recv.serial_number,
+                    recv.ctrl_url,
+                    recv.zone,
+                )
                 if recv.ctrl_url == config_info.ctrl_url:
-                    _LOGGER.debug("Config Zones Matched %s", config_info.ctrl_url)
-                    zones = recv.zone_controllers()
+                    _LOGGER.debug(
+                        "Config Zones Matched Serial %s: %s",
+                        recv.ctrl_url,
+                        recv.serial_number,
+                    )
+                    zones = rxv.RXV(
+                        config_info.ctrl_url,
+                        friendly_name=config_info.name,
+                        serial_number=recv.serial_number,
+                        model_name=recv.model_name,
+                    ).zone_controllers()
                     break
 
         if not zones:
@@ -170,7 +186,7 @@ async def async_setup_platform(
 
     entities = []
     for zctrl in zone_ctrls:
-        _LOGGER.debug("Receiver zone: %s", zctrl.zone)
+        _LOGGER.debug("Receiver zone: %s serial %s", zctrl.zone, zctrl.serial_number)
         if config_info.zone_ignore and zctrl.zone in config_info.zone_ignore:
             _LOGGER.debug("Ignore receiver zone: %s %s", config_info.name, zctrl.zone)
             continue
diff --git a/tests/components/yamaha/test_media_player.py b/tests/components/yamaha/test_media_player.py
index d96da8f6854..2375e7d07f4 100644
--- a/tests/components/yamaha/test_media_player.py
+++ b/tests/components/yamaha/test_media_player.py
@@ -86,17 +86,25 @@ async def test_setup_host(hass: HomeAssistant, device, device2, main_zone) -> No
     assert state.state == "off"
 
 
-async def test_setup_attribute_error(hass: HomeAssistant, device, main_zone) -> None:
-    """Test set up integration encountering an Attribute Error."""
+@pytest.mark.parametrize(
+    ("error"),
+    [
+        AttributeError,
+        ValueError,
+        UnicodeDecodeError("", b"", 1, 0, ""),
+    ],
+)
+async def test_setup_find_errors(hass: HomeAssistant, device, main_zone, error) -> None:
+    """Test set up integration encountering an Error."""
 
-    with patch("rxv.find", side_effect=AttributeError):
+    with patch("rxv.find", side_effect=error):
         assert await async_setup_component(hass, MP_DOMAIN, CONFIG)
         await hass.async_block_till_done()
 
-    state = hass.states.get("media_player.yamaha_receiver_main_zone")
+        state = hass.states.get("media_player.yamaha_receiver_main_zone")
 
-    assert state is not None
-    assert state.state == "off"
+        assert state is not None
+        assert state.state == "off"
 
 
 async def test_setup_no_host(hass: HomeAssistant, device, main_zone) -> None: