diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 3bc4e8c2..85784e23 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1061,11 +1061,7 @@ class HomeAssistant extends BaseExtension {
                 payload.tilt_status_topic = stateTopic;
             }
 
-            // Set json_attributes_topic for types which support this
-            // https://github.com/Koenkk/zigbee2mqtt/issues/840
-            if (['binary_sensor', 'sensor', 'lock', 'climate', 'fan'].includes(config.type)) {
-                payload.json_attributes_topic = payload.state_topic;
-            }
+            payload.json_attributes_topic = payload.state_topic;
 
             // Set (unique) name
             payload.name = `${entity.friendlyName}_${config.object_id}`;