From 67ac4882f27f1bb5e7ccd6fdad84b882ebd6cf44 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Tue, 22 Oct 2024 03:02:29 -0700
Subject: [PATCH] Dont attempt to add devices to disabled zwave config (#22461)

---
 .../integrations/protocolIntegrationPicked.ts | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/common/integrations/protocolIntegrationPicked.ts b/src/common/integrations/protocolIntegrationPicked.ts
index d6125b172b..1f7ea0b3b8 100644
--- a/src/common/integrations/protocolIntegrationPicked.ts
+++ b/src/common/integrations/protocolIntegrationPicked.ts
@@ -34,9 +34,11 @@ export const protocolIntegrationPicked = async (
   if (domain === "zwave_js") {
     const entries = options?.config_entry
       ? undefined
-      : await getConfigEntries(hass, {
-          domain,
-        });
+      : (
+          await getConfigEntries(hass, {
+            domain,
+          })
+        ).filter((e) => !e.disabled_by);
 
     if (
       !isComponentLoaded(hass, "zwave_js") ||
@@ -81,9 +83,11 @@ export const protocolIntegrationPicked = async (
   } else if (domain === "zha") {
     const entries = options?.config_entry
       ? undefined
-      : await getConfigEntries(hass, {
-          domain,
-        });
+      : (
+          await getConfigEntries(hass, {
+            domain,
+          })
+        ).filter((e) => !e.disabled_by);
 
     if (
       !isComponentLoaded(hass, "zha") ||
@@ -129,9 +133,11 @@ export const protocolIntegrationPicked = async (
   } else if (domain === "matter") {
     const entries = options?.config_entry
       ? undefined
-      : await getConfigEntries(hass, {
-          domain,
-        });
+      : (
+          await getConfigEntries(hass, {
+            domain,
+          })
+        ).filter((e) => !e.disabled_by);
     if (
       !isComponentLoaded(hass, domain) ||
       (!options?.config_entry && !entries?.length)