diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index 6b7e48887e..92900b97dd 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -213,6 +213,7 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
         entity_category: 'diagnostic',
         state_class: 'measurement',
     },
+    distance: {device_class: 'distance', state_class: 'measurement'},
     duration: {entity_category: 'config', icon: 'mdi:timer'},
     eco2: {device_class: 'carbon_dioxide', state_class: 'measurement'},
     eco_temperature: {entity_category: 'config', icon: 'mdi:thermometer'},
@@ -235,17 +236,19 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
         state_class: 'measurement',
     },
     local_temperature: {device_class: 'temperature', state_class: 'measurement'},
+    max_range: {entity_category: 'config', icon: 'mdi:signal-distance-variant'},
     max_temperature: {entity_category: 'config', icon: 'mdi:thermometer-high'},
     max_temperature_limit: {entity_category: 'config', icon: 'mdi:thermometer-high'},
     min_temperature_limit: {entity_category: 'config', icon: 'mdi:thermometer-low'},
     min_temperature: {entity_category: 'config', icon: 'mdi:thermometer-low'},
     minimum_on_level: {entity_category: 'config'},
     measurement_poll_interval: {entity_category: 'config', icon: 'mdi:clock-out'},
+    motion_sensitivity: {entity_category: 'config', icon: 'mdi:motion-sensor'},
     noise: {device_class: 'sound_pressure', state_class: 'measurement'},
     noise_detect_level: {icon: 'mdi:volume-equal'},
     noise_timeout: {icon: 'mdi:timer'},
     occupancy_level: {icon: 'mdi:motion-sensor'},
-    occupancy_sensitivity: {icon: 'mdi:motion-sensor'},
+    occupancy_sensitivity: {entity_category: 'config', icon: 'mdi:motion-sensor'},
     occupancy_timeout: {entity_category: 'config', icon: 'mdi:timer'},
     overload_protection: {icon: 'mdi:flash'},
     pm10: {device_class: 'pm10', state_class: 'measurement'},