diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index f4f66927..d2824803 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -474,8 +474,7 @@ class HomeAssistant extends Extension {
          * https://github.com/Koenkk/zigbee2mqtt/issues/959#issuecomment-480341347
          */
         if (settings.get().advanced.homeassistant_legacy_triggers) {
-            const keys = ['action', 'click'].filter((k) =>
-                data.messagePayload.hasOwnProperty(k) && data.messagePayload[k] !== '');
+            const keys = ['action', 'click'].filter((k) => data.messagePayload[k]);
             for (const key of keys) {
                 this.publishEntityState(data.entity.device.ieeeAddr, {[key]: ''});
             }
@@ -488,7 +487,7 @@ class HomeAssistant extends Extension {
          * and republish it to zigbee2mqtt/my_devic/action
          */
         if (data.entity.definition) {
-            const keys = ['action', 'click'].filter((k) => data.messagePayload[k] && data.messagePayload[k] !== '');
+            const keys = ['action', 'click'].filter((k) => data.messagePayload[k]);
             for (const key of keys) {
                 const value = data.messagePayload[key].toString();
                 await this.publishDeviceTriggerDiscover(data.entity, key, value);