diff --git a/custom_components/whatsapp_bridge_integration/__init__.py b/custom_components/whatsapp_bridge_integration/__init__.py
index 6f4a936..bd279dd 100644
--- a/custom_components/whatsapp_bridge_integration/__init__.py
+++ b/custom_components/whatsapp_bridge_integration/__init__.py
@@ -40,16 +40,18 @@ async def async_setup_entry(hass: HomeAssistant, entry):
         name=f"WhatsApp {entry.title}",
         manufacturer="Bahmcloud",
         model="Kontakt-Endpunkt",
-        sw_version="0.2.3",
+        sw_version="0.2.4",
     )
 
-    # 3. Zentralen System-Hub VOLLKOMMEN UNABHÄNGIG anlegen (ohne feste config_entry_id Bindung)
+    # 3. Zentralen System-Hub anlegen mit erzwungener config_entry_id Bindung (HA Core Anforderung)
+    # Nutzt Multi-Entry-Zusammenführung über den fixen "global_bridge_hub" Identifier.
     device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, "global_bridge_hub")},
         name="WhatsApp Bridge Hub",
         manufacturer="Bahmcloud",
         model="Bridge Server",
-        sw_version="0.2.3",
+        sw_version="0.2.4",
     )
 
     # Forward the setup to the sensor platform to create entities