diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md
index 302b466fd..bedc00497 100644
--- a/docs/integration/home_assistant.md
+++ b/docs/integration/home_assistant.md
@@ -255,11 +255,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes: 
-      - "linkquality"
-      - "action"
-      - "duration"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -269,12 +264,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -287,11 +276,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes: 
-      - "linkquality"
-      - "action"
-      - "duration"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -301,12 +285,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -319,11 +297,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes: 
-      - "linkquality"
-      - "action"
-      - "duration"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -333,12 +306,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -351,11 +318,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes: 
-      - "linkquality"
-      - "action"
-      - "duration"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -365,12 +327,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -383,11 +339,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes: 
-      - "linkquality"
-      - "action"
-      - "duration"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -397,12 +348,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -439,14 +384,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -461,9 +398,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_left"
 
 switch:
   - platform: "mqtt"
@@ -473,9 +407,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_right"
 ```
 {% endraw %}
 
@@ -490,9 +421,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_left"
 
 switch:
   - platform: "mqtt"
@@ -502,9 +430,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_right"
 
 sensor:
   - platform: "mqtt"
@@ -513,14 +438,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -534,9 +451,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -545,9 +459,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "humidity"
     value_template: "{{ value_json.humidity }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -556,12 +467,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -575,9 +480,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -586,9 +488,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "humidity"
     value_template: "{{ value_json.humidity }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -597,9 +496,6 @@ sensor:
     unit_of_measurement: "hPa"
     device_class: "pressure"
     value_template: "{{ value_json.pressure }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -608,12 +504,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -636,12 +526,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -664,9 +548,6 @@ sensor:
     unit_of_measurement: "lx"
     device_class: "illuminance"
     value_template: "{{ value_json.illuminance }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -675,12 +556,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -703,12 +578,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -731,12 +600,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -759,12 +622,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -777,20 +634,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes: 
-      - "linkquality"
-      - "angle"
-      - "side"
-      - "from_side"
-      - "to_side"
-      - "brightness"
-      - "angle_x_absolute"
-      - "angle_y_absolute"
-      - "angle_z"
-      - "angle_y"
-      - "angle_x"
-      - "unknown_data"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -800,12 +643,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -828,14 +665,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -858,14 +687,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -888,12 +709,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -916,12 +731,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -941,11 +750,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:lock"
     value_template: "{{ value_json.inserted }}"
-    json_attributes: 
-      - "linkquality"
-      - "forgotten"
-      - "keyerror"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -958,20 +762,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes: 
-      - "linkquality"
-      - "angle"
-      - "side"
-      - "from_side"
-      - "to_side"
-      - "brightness"
-      - "angle_x_absolute"
-      - "angle_y_absolute"
-      - "angle_z"
-      - "angle_y"
-      - "angle_x"
-      - "unknown_data"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -981,12 +771,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1006,10 +790,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     value_template: "{{ value_json.position }}"
     icon: "mdi:view-array"
-    json_attributes: 
-      - "linkquality"
-      - "running"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1145,9 +925,6 @@ sensor:
     unit_of_measurement: "brightness"
     icon: "mdi:brightness-5"
     value_template: "{{ value_json.brightness }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -1156,12 +933,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1270,20 +1041,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes: 
-      - "linkquality"
-      - "angle"
-      - "side"
-      - "from_side"
-      - "to_side"
-      - "brightness"
-      - "angle_x_absolute"
-      - "angle_y_absolute"
-      - "angle_z"
-      - "angle_y"
-      - "angle_x"
-      - "unknown_data"
-      - "last_seen"
     force_update: true
 ```
 {% endraw %}
@@ -1580,20 +1337,6 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes: 
-      - "linkquality"
-      - "angle"
-      - "side"
-      - "from_side"
-      - "to_side"
-      - "brightness"
-      - "angle_x_absolute"
-      - "angle_y_absolute"
-      - "angle_z"
-      - "angle_y"
-      - "angle_x"
-      - "unknown_data"
-      - "last_seen"
     force_update: true
 
 sensor:
@@ -1603,12 +1346,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1631,9 +1368,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -1642,9 +1376,6 @@ sensor:
     unit_of_measurement: "lx"
     device_class: "illuminance"
     value_template: "{{ value_json.illuminance }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 sensor:
   - platform: "mqtt"
@@ -1653,12 +1384,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1694,14 +1419,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1722,11 +1439,6 @@ sensor:
     state_topic: "zigbee2mqtt/<FRIENDLY_NAME>"
     availability_topic: "zigbee2mqtt/bridge/state"
     value_template: "{{ value_json.linkquality }}"
-    json_attributes: 
-      - "description"
-      - "type"
-      - "rssi"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -1755,9 +1467,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_left"
 
 switch:
   - platform: "mqtt"
@@ -1767,9 +1476,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_right"
 ```
 {% endraw %}
 
@@ -1784,9 +1490,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_left"
 
 switch:
   - platform: "mqtt"
@@ -1796,9 +1499,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_right"
 
 switch:
   - platform: "mqtt"
@@ -1808,9 +1508,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_center }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/center/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_center"
 ```
 {% endraw %}
 
@@ -1825,9 +1522,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_bottom_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/bottom_left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_bottom_left"
 
 switch:
   - platform: "mqtt"
@@ -1837,9 +1531,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_bottom_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/bottom_right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_bottom_right"
 
 switch:
   - platform: "mqtt"
@@ -1849,9 +1540,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_top_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/top_left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_top_left"
 
 switch:
   - platform: "mqtt"
@@ -1861,9 +1549,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_top_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/top_right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_top_right"
 ```
 {% endraw %}
 
@@ -2134,9 +1819,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -2455,14 +2137,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -2745,14 +2419,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -2794,9 +2460,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_left"
 
 switch:
   - platform: "mqtt"
@@ -2806,9 +2469,6 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes: 
-      - "linkquality"
-      - "button_right"
 ```
 {% endraw %}
 
@@ -2931,12 +2591,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -2959,12 +2613,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -2978,9 +2626,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 
 binary_sensor:
   - platform: "mqtt"
@@ -3012,9 +2657,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -3105,12 +2747,6 @@ sensor:
     unit_of_measurement: "%"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "action"
-      - "sensitivity"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -3133,14 +2769,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -3183,9 +2811,6 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes: 
-      - "linkquality"
-      - "last_seen"
 ```
 {% endraw %}
 
@@ -3278,14 +2903,6 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes: 
-      - "linkquality"
-      - "voltage"
-      - "temperature"
-      - "consumption"
-      - "current"
-      - "power_factor"
-      - "last_seen"
 ```
 {% endraw %}
 
diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 7972c42b8..08d9f8b6b 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -84,7 +84,6 @@ const configurations = {
             unit_of_measurement: 'lx',
             device_class: 'illuminance',
             value_template: '{{ value_json.illuminance }}',
-            json_attributes: ['linkquality', 'last_seen'],
         },
     },
     'sensor_humidity': {
@@ -94,7 +93,6 @@ const configurations = {
             unit_of_measurement: '%',
             device_class: 'humidity',
             value_template: '{{ value_json.humidity }}',
-            json_attributes: ['linkquality', 'last_seen'],
         },
     },
     'sensor_temperature': {
@@ -104,7 +102,6 @@ const configurations = {
             unit_of_measurement: '°C',
             device_class: 'temperature',
             value_template: '{{ value_json.temperature }}',
-            json_attributes: ['linkquality', 'last_seen'],
         },
     },
     'sensor_pressure': {
@@ -114,7 +111,6 @@ const configurations = {
             unit_of_measurement: 'hPa',
             device_class: 'pressure',
             value_template: '{{ value_json.pressure }}',
-            json_attributes: ['linkquality', 'last_seen'],
         },
     },
     'sensor_click': {
@@ -123,7 +119,6 @@ const configurations = {
         discovery_payload: {
             icon: 'mdi:toggle-switch',
             value_template: '{{ value_json.click }}',
-            json_attributes: ['linkquality', 'action', 'duration', 'last_seen'],
             force_update: true,
         },
     },
@@ -134,9 +129,6 @@ const configurations = {
             unit_of_measurement: 'Watt',
             icon: 'mdi:flash',
             value_template: '{{ value_json.power }}',
-            json_attributes: [
-                'linkquality', 'voltage', 'temperature', 'consumption', 'current', 'power_factor', 'last_seen',
-            ],
         },
     },
     'sensor_action': {
@@ -145,11 +137,6 @@ const configurations = {
         discovery_payload: {
             icon: 'mdi:gesture-double-tap',
             value_template: '{{ value_json.action }}',
-            json_attributes: [
-                'linkquality', 'angle', 'side', 'from_side', 'to_side', 'brightness',
-                'angle_x_absolute', 'angle_y_absolute', 'angle_z', 'angle_y', 'angle_x', 'unknown_data',
-                'last_seen',
-            ],
             force_update: true,
         },
     },
@@ -160,7 +147,6 @@ const configurations = {
             unit_of_measurement: 'brightness',
             icon: 'mdi:brightness-5',
             value_template: '{{ value_json.brightness }}',
-            json_attributes: ['linkquality', 'last_seen'],
         },
     },
     'sensor_lock': {
@@ -169,7 +155,6 @@ const configurations = {
         discovery_payload: {
             icon: 'mdi:lock',
             value_template: '{{ value_json.inserted }}',
-            json_attributes: ['linkquality', 'forgotten', 'keyerror', 'last_seen'],
         },
     },
     'sensor_battery': {
@@ -179,7 +164,6 @@ const configurations = {
             unit_of_measurement: '%',
             device_class: 'battery',
             value_template: '{{ value_json.battery }}',
-            json_attributes: ['linkquality', 'voltage', 'action', 'sensitivity', 'last_seen'],
         },
     },
     'sensor_linkquality': {
@@ -187,7 +171,6 @@ const configurations = {
         object_id: 'linkquality',
         discovery_payload: {
             value_template: '{{ value_json.linkquality }}',
-            json_attributes: ['description', 'type', 'rssi', 'last_seen'],
         },
     },
     'sensor_gas_density': {
@@ -204,7 +187,6 @@ const configurations = {
         discovery_payload: {
             value_template: '{{ value_json.position }}',
             icon: 'mdi:view-array',
-            json_attributes: ['linkquality', 'running', 'last_seen'],
         },
     },
 
@@ -283,7 +265,6 @@ const switchWithPostfix = (postfix) => {
             value_template: `{{ value_json.state_${postfix} }}`,
             command_topic: true,
             command_topic_prefix: postfix,
-            json_attributes: ['linkquality', `button_${postfix}`],
         },
     };
 };
@@ -530,6 +511,12 @@ class HomeAssistant {
             const payload = {...config.discovery_payload};
             payload.state_topic = `${settings.get().mqtt.base_topic}/${friendlyName}`;
 
+            // Set json_attributes_topic for types which support this
+            // https://github.com/Koenkk/zigbee2mqtt/issues/840
+            if (['binary_sensor', 'sensor'].includes(config.type)) {
+                payload.json_attributes_topic = payload.state_topic;
+            }
+
             // Set (unique) name
             payload.name = `${friendlyName}_${config.object_id}`;
 
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 7f1de2a99..9324399ee 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -49,7 +49,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': '°C',
             'device_class': 'temperature',
             'value_template': '{{ value_json.temperature }}',
-            'json_attributes': ['linkquality', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_temperature',
             'unique_id': '0x12345678_temperature_zigbee2mqtt',
@@ -73,7 +73,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': '%',
             'device_class': 'humidity',
             'value_template': '{{ value_json.humidity }}',
-            'json_attributes': ['linkquality', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_humidity',
             'unique_id': '0x12345678_humidity_zigbee2mqtt',
@@ -97,7 +97,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': 'hPa',
             'device_class': 'pressure',
             'value_template': '{{ value_json.pressure }}',
-            'json_attributes': ['linkquality', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_pressure',
             'unique_id': '0x12345678_pressure_zigbee2mqtt',
@@ -121,7 +121,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': '%',
             'device_class': 'battery',
             'value_template': '{{ value_json.battery }}',
-            'json_attributes': ['linkquality', 'voltage', 'action', 'sensitivity', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_battery',
             'unique_id': '0x12345678_battery_zigbee2mqtt',
@@ -160,7 +160,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': '°C',
             'device_class': 'temperature',
             'value_template': '{{ (value_json.temperature | float) | round(1) }}',
-            'json_attributes': ['linkquality', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_temperature',
             'unique_id': '0x12345678_temperature_zigbee2mqtt',
@@ -184,7 +184,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': '%',
             'device_class': 'humidity',
             'value_template': '{{ (value_json.humidity | float) | round(0) }}',
-            'json_attributes': ['linkquality', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_humidity',
             'unique_id': '0x12345678_humidity_zigbee2mqtt',
@@ -208,7 +208,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': 'hPa',
             'device_class': 'pressure',
             'value_template': '{{ (value_json.pressure | float) | round(2) }}',
-            'json_attributes': ['linkquality', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_pressure',
             'unique_id': '0x12345678_pressure_zigbee2mqtt',
@@ -232,7 +232,7 @@ describe('HomeAssistant extension', () => {
             'unit_of_measurement': '%',
             'device_class': 'battery',
             'value_template': '{{ value_json.battery }}',
-            'json_attributes': ['linkquality', 'voltage', 'action', 'sensitivity', 'last_seen'],
+            'json_attributes_topic': 'zigbee2mqtt/my_device',
             'state_topic': 'zigbee2mqtt/my_device',
             'name': 'my_device_battery',
             'unique_id': '0x12345678_battery_zigbee2mqtt',