diff --git a/custom_components/bluetti_bt/binary_sensor.py b/custom_components/bluetti_bt/binary_sensor.py
index a52a269..807ceb4 100644
--- a/custom_components/bluetti_bt/binary_sensor.py
+++ b/custom_components/bluetti_bt/binary_sensor.py
@@ -91,6 +91,7 @@ class BluettiBinarySensor(CoordinatorEntity, BinarySensorEntity):
         """Init battery entity."""
         super().__init__(coordinator)
 
+        self._attr_has_entity_name = True
         e_name = f"{device_info.get('name')} {name}"
         self._address = address
         self._response_key = response_key
diff --git a/custom_components/bluetti_bt/sensor.py b/custom_components/bluetti_bt/sensor.py
index 428800e..5f930e8 100644
--- a/custom_components/bluetti_bt/sensor.py
+++ b/custom_components/bluetti_bt/sensor.py
@@ -122,6 +122,7 @@ class BluettiSensor(CoordinatorEntity, SensorEntity):
         """Init battery entity."""
         super().__init__(coordinator)
 
+        self._attr_has_entity_name = True
         e_name = f"{device_info.get('name')} {name}"
         self._address = address
         self._response_key = response_key
diff --git a/custom_components/bluetti_bt/switch.py b/custom_components/bluetti_bt/switch.py
index 62280e4..c244afd 100644
--- a/custom_components/bluetti_bt/switch.py
+++ b/custom_components/bluetti_bt/switch.py
@@ -108,6 +108,7 @@ class BluettiSwitch(CoordinatorEntity, SwitchEntity):
         self._entry_id = entry_id
 
         self._attr_device_info = device_info
+        self._attr_has_entity_name = True
         self._attr_name = e_name
         self._attr_available = False
         self._attr_unique_id = get_unique_id(e_name)