From a7c6abc54ead541ff6246448b58cd25bc18d5f9c Mon Sep 17 00:00:00 2001
From: Artur Pragacz <49985303+arturpragacz@users.noreply.github.com>
Date: Sat, 24 Aug 2024 06:04:44 +0200
Subject: [PATCH] Always assign unique_id in Onkyo (#120543)

---
 homeassistant/components/onkyo/media_player.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py
index 8107c62e4a1..acc0459e258 100644
--- a/homeassistant/components/onkyo/media_player.py
+++ b/homeassistant/components/onkyo/media_player.py
@@ -320,14 +320,11 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
         name = receiver.name
         identifier = receiver.identifier
         self._attr_name = f"{name}{' ' + ZONES[zone] if zone != 'main' else ''}"
-        if receiver.discovered:
-            if zone == "main":
-                # keep legacy unique_id
-                self._attr_unique_id = f"{name}_{identifier}"
-            else:
-                self._attr_unique_id = f"{identifier}_{zone}"
+        if receiver.discovered and zone == "main":
+            # keep legacy unique_id
+            self._attr_unique_id = f"{name}_{identifier}"
         else:
-            self._attr_unique_id = None
+            self._attr_unique_id = f"{identifier}_{zone}"
 
         self._zone = zone
         self._source_mapping = sources