diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 20bcf838c..1840dd94f 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -365,14 +365,17 @@ class HomeAssistant extends Extension {
                         eco2: {icon: 'mdi:molecule-co2'},
                         co2: {icon: 'mdi:molecule-co2'},
                         local_temperature: {device_class: 'temperature'},
+                        x_axis: {icon: 'mdi:axis-x-arrow'},
+                        y_axis: {icon: 'mdi:axis-y-arrow'},
+                        z_axis: {icon: 'mdi:axis-z-arrow'},
                     };
 
                     discoveryEntry = {
                         type: 'sensor',
                         object_id: expose.endpoint ? `${expose.name}_${expose.endpoint}` : `${expose.name}`,
                         discovery_payload: {
-                            unit_of_measurement: expose.unit ? expose.unit : '-',
                             value_template: `{{ value_json.${expose.property} }}`,
+                            ...(expose.unit && {unit_of_measurement: expose.unit}),
                             ...lookup[expose.name],
                         },
                     };