diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 0721ecd4d..d19b03285 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -358,18 +358,24 @@ class HomeAssistant extends Extension {
                         temperature: {device_class: 'temperature', state_class: 'measurement'},
                         humidity: {device_class: 'humidity', state_class: 'measurement'},
                         illuminance_lux: {device_class: 'illuminance', state_class: 'measurement'},
-                        illuminance: {device_class: 'illuminance', state_class: 'measurement'},
+                        illuminance: {
+                            device_class: 'illuminance', enabled_by_default: false, state_class: 'measurement',
+                        },
                         soil_moisture: {icon: 'mdi:water-percent', state_class: 'measurement'},
                         position: {icon: 'mdi:valve', state_class: 'measurement'},
                         pressure: {device_class: 'pressure', state_class: 'measurement'},
                         power: {device_class: 'power', state_class: 'measurement'},
-                        linkquality: {icon: 'mdi:signal', state_class: 'measurement'},
+                        linkquality: {enabled_by_default: false, icon: 'mdi:signal', state_class: 'measurement'},
                         current: {device_class: 'current', state_class: 'measurement'},
-                        voltage: {device_class: 'voltage', state_class: 'measurement'},
+                        voltage: {device_class: 'voltage', enabled_by_default: false, state_class: 'measurement'},
                         current_phase_b: {device_class: 'current', state_class: 'measurement'},
-                        voltage_phase_b: {device_class: 'voltage', state_class: 'measurement'},
+                        voltage_phase_b: {
+                            device_class: 'voltage', enabled_by_default: false, state_class: 'measurement',
+                        },
                         current_phase_c: {device_class: 'current', state_class: 'measurement'},
-                        voltage_phase_c: {device_class: 'voltage', state_class: 'measurement'},
+                        voltage_phase_c: {
+                            device_class: 'voltage', enabled_by_default: false, state_class: 'measurement',
+                        },
                         energy: {device_class: 'energy'},
                         smoke_density: {icon: 'mdi:google-circles-communities', state_class: 'measurement'},
                         gas_density: {icon: 'mdi:google-circles-communities', state_class: 'measurement'},
@@ -378,8 +384,8 @@ class HomeAssistant extends Extension {
                         voc: {icon: 'mdi:air-filter', state_class: 'measurement'},
                         aqi: {icon: 'mdi:air-filter', state_class: 'measurement'},
                         hcho: {icon: 'mdi:air-filter', state_class: 'measurement'},
-                        requested_brightness_level: {icon: 'mdi:brightness-5'},
-                        requested_brightness_percent: {icon: 'mdi:brightness-5'},
+                        requested_brightness_level: {enabled_by_default: false, icon: 'mdi:brightness-5'},
+                        requested_brightness_percent: {enabled_by_default: false, icon: 'mdi:brightness-5'},
                         eco2: {icon: 'mdi:molecule-co2', state_class: 'measurement'},
                         co2: {icon: 'mdi:molecule-co2', state_class: 'measurement'},
                         local_temperature: {device_class: 'temperature', state_class: 'measurement'},
@@ -543,6 +549,7 @@ class HomeAssistant extends Extension {
                 discovery_payload: {
                     icon: 'mdi:update',
                     value_template: `{{ value_json['update']['state'] }}`,
+                    enabled_by_default: false,
                 },
             };
 
@@ -555,6 +562,7 @@ class HomeAssistant extends Extension {
                         payload_on: true,
                         payload_off: false,
                         value_template: '{{ value_json.update_available}}',
+                        enabled_by_default: false,
                     },
                 };
                 configs.push(updateAvailableSensor);
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 91d08e2d4..3db4d74ca 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -157,6 +157,7 @@ describe('HomeAssistant extension', () => {
 
         payload = {
             'icon': 'mdi:signal',
+            'enabled_by_default': false,
             'unit_of_measurement': 'lqi',
             'state_class': 'measurement',
             'value_template': '{{ value_json.linkquality }}',
@@ -1168,6 +1169,7 @@ describe('HomeAssistant extension', () => {
             "payload_on":true,
             "payload_off":false,
             "value_template":"{{ value_json.update_available}}",
+            "enabled_by_default": false,
             "state_topic":"zigbee2mqtt/bulb",
             "json_attributes_topic":"zigbee2mqtt/bulb",
             "name":"bulb update available",