diff --git a/homeassistant/components/emoncms/sensor.py b/homeassistant/components/emoncms/sensor.py
index 9273c24c7dc..291ecad0bd3 100644
--- a/homeassistant/components/emoncms/sensor.py
+++ b/homeassistant/components/emoncms/sensor.py
@@ -317,7 +317,7 @@ async def async_setup_entry(
             EmonCmsSensor(
                 coordinator,
                 unique_id,
-                elem["unit"],
+                elem.get("unit"),
                 name,
                 idx,
             )
@@ -353,6 +353,7 @@ class EmonCmsSensor(CoordinatorEntity[EmoncmsCoordinator], SensorEntity):
             self.entity_description = description
         else:
             self._attr_native_unit_of_measurement = unit_of_measurement
+            self._attr_name = f"{name} {elem[FEED_NAME]}"
         self._update_attributes(elem)
 
     def _update_attributes(self, elem: dict[str, Any]) -> None: