diff --git a/custom_components/saleryd_hrv/const.py b/custom_components/saleryd_hrv/const.py
index c4d7650..670772b 100644
--- a/custom_components/saleryd_hrv/const.py
+++ b/custom_components/saleryd_hrv/const.py
@@ -10,7 +10,7 @@
 ISSUE_URL = "https://github.com/bj00rn/ha-saleryd-ftx/issues"
 SUPPORTED_FIRMWARES = ["4.1.5"]
 UNSUPPORTED_FIRMWARES = ["4.1.1"]
-CONFIG_VERSION = 3
+CONFIG_VERSION = 4
 
 # Icons
 ICON = "mdi:format-quote-close"
diff --git a/custom_components/saleryd_hrv/entity.py b/custom_components/saleryd_hrv/entity.py
index afdd776..b576031 100644
--- a/custom_components/saleryd_hrv/entity.py
+++ b/custom_components/saleryd_hrv/entity.py
@@ -23,7 +23,7 @@ def __init__(
         self._attr_unique_id = f"{entry.unique_id}_{slugify(entity_description.name)}"
         self._attr_should_poll = False
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, entry.entry_id)},
+            identifiers={(DOMAIN, entry.unique_id)},
             name=entry.data.get(CONF_NAME),
             manufacturer=MANUFACTURER,
         )
@@ -42,7 +42,7 @@ def __init__(
         self._entry = entry
         self.entity_description = entity_description
         self._attr_name = entity_description.name
-        self._attr_unique_id = f"{entry.unique_id}_{slugify(entity_description.name)}"
+        self._attr_unique_id = f"{entry.entry_id}_{slugify(entity_description.name)}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, entry.entry_id)},
             name=entry.data.get(CONF_NAME),