From ced70971cb013565a4099e7e5a57ff92313f72cc Mon Sep 17 00:00:00 2001
From: regevbr <regevbr@gmail.com>
Date: Thu, 14 Mar 2024 00:11:56 +0200
Subject: [PATCH] fix setting attribute changes state to None

---
 custom_components/zha_toolkit/utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/custom_components/zha_toolkit/utils.py b/custom_components/zha_toolkit/utils.py
index c24fd54..09c9454 100644
--- a/custom_components/zha_toolkit/utils.py
+++ b/custom_components/zha_toolkit/utils.py
@@ -356,7 +356,11 @@ def set_state(
     #              entity_id, key, value, stateAttrs)
     if key is not None:
         stateAttrs[key] = value
-        value = None
+        if stateObj is not None:
+            # Copy existing state, to update selected item
+            value = stateObj.state
+        else:
+            value = None
 
     # LOGGER.debug("entity:%s key:%s value:%s attrs:%s",
     #              entity_id, key, value, stateAttrs)