From 8e8ccb7ce413b68a88824cd825654077bee56263 Mon Sep 17 00:00:00 2001
From: Hans Oischinger <hans.oischinger@gmail.com>
Date: Wed, 27 Oct 2021 14:19:26 +0200
Subject: [PATCH] Fix Vicare unique_ids (#58531)

---
 homeassistant/components/vicare/climate.py      | 2 +-
 homeassistant/components/vicare/water_heater.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/vicare/climate.py b/homeassistant/components/vicare/climate.py
index ba32e65ee52..7d644c3c05d 100644
--- a/homeassistant/components/vicare/climate.py
+++ b/homeassistant/components/vicare/climate.py
@@ -159,7 +159,7 @@ class ViCareClimate(ClimateEntity):
     @property
     def unique_id(self):
         """Return unique ID for this device."""
-        return f"{self._device_config.getConfig().serial}-climate-{self._circuit.id}"
+        return f"{self._device_config.getConfig().serial}-{self._circuit.id}"
 
     @property
     def device_info(self):
diff --git a/homeassistant/components/vicare/water_heater.py b/homeassistant/components/vicare/water_heater.py
index 524ea52c756..883bcd3efd5 100644
--- a/homeassistant/components/vicare/water_heater.py
+++ b/homeassistant/components/vicare/water_heater.py
@@ -135,7 +135,7 @@ class ViCareWater(WaterHeaterEntity):
     @property
     def unique_id(self):
         """Return unique ID for this device."""
-        return f"{self._device_config.getConfig().serial}-water-{self._circuit.id}"
+        return f"{self._device_config.getConfig().serial}-{self._circuit.id}"
 
     @property
     def device_info(self):