diff --git a/app/fanout/mqtt_ha.py b/app/fanout/mqtt_ha.py
index b8d1278..4cbacea 100644
--- a/app/fanout/mqtt_ha.py
+++ b/app/fanout/mqtt_ha.py
@@ -108,11 +108,11 @@ _LPP_HA_META: dict[str, dict[str, Any]] = {
     "humidity": {"device_class": "humidity", "unit": "%", "precision": 1},
     "barometer": {"device_class": "atmospheric_pressure", "unit": "hPa", "precision": 1},
     "voltage": {"device_class": "voltage", "unit": "V", "precision": 2},
-    "current": {"device_class": "current", "unit": "mA", "precision": 1},
+    "current": {"device_class": "current", "unit": "A", "precision": 3},
     "luminosity": {"device_class": "illuminance", "unit": "lux", "precision": 0},
     "power": {"device_class": "power", "unit": "W", "precision": 1},
     "energy": {"device_class": "energy", "unit": "kWh", "precision": 2},
-    "distance": {"device_class": "distance", "unit": "mm", "precision": 0},
+    "distance": {"device_class": "distance", "unit": "m", "precision": 3},
     "concentration": {"device_class": None, "unit": "ppm", "precision": 0},
     "direction": {"device_class": None, "unit": "°", "precision": 0},
     "altitude": {"device_class": None, "unit": "m", "precision": 1},
diff --git a/frontend/src/components/repeater/repeaterPaneShared.tsx b/frontend/src/components/repeater/repeaterPaneShared.tsx
index 5dc31c3..835d1b6 100644
--- a/frontend/src/components/repeater/repeaterPaneShared.tsx
+++ b/frontend/src/components/repeater/repeaterPaneShared.tsx
@@ -216,7 +216,7 @@ export const LPP_UNIT_MAP: Record<string, string> = {
   luminosity: 'lux',
   altitude: 'm',
   power: 'W',
-  distance: 'mm',
+  distance: 'm',
   energy: 'kWh',
   direction: '°',
   concentration: 'ppm',