diff --git a/homeassistant/components/yamaha/media_player.py b/homeassistant/components/yamaha/media_player.py
index 86bb0b11ec0..a97b31db52b 100644
--- a/homeassistant/components/yamaha/media_player.py
+++ b/homeassistant/components/yamaha/media_player.py
@@ -205,6 +205,11 @@ class YamahaDevice(MediaPlayerEntity):
         self._play_status = None
         self._name = name
         self._zone = receiver.zone
+        if self.receiver.serial_number is not None:
+            # Since not all receivers will have a serial number and set a unique id
+            # the default name of the integration may not be changed
+            # to avoid a breaking change.
+            self._attr_unique_id = f"{self.receiver.serial_number}_{self._zone}"
 
     def update(self) -> None:
         """Get the latest details from the device."""