diff --git a/lib/extension/publish.js b/lib/extension/publish.js
index 850792f87..90b6c1e22 100644
--- a/lib/extension/publish.js
+++ b/lib/extension/publish.js
@@ -235,11 +235,9 @@ class EntityPublish extends Extension {
                         const msg = result.state;
 
                         if (endpointName) {
-                            for (const key of ['state', 'brightness', 'color', 'color_temp', 'color_mode']) {
-                                if (msg.hasOwnProperty(key)) {
-                                    msg[`${key}_${endpointName}`] = msg[key];
-                                    delete msg[key];
-                                }
+                            for (const key of Object.keys(msg)) {
+                                msg[`${key}_${endpointName}`] = msg[key];
+                                delete msg[key];
                             }
                         }