diff --git a/custom_components/ble_monitor/config_flow.py b/custom_components/ble_monitor/config_flow.py
index 5836f0e21..7d0fb6fab 100644
--- a/custom_components/ble_monitor/config_flow.py
+++ b/custom_components/ble_monitor/config_flow.py
@@ -323,7 +323,7 @@ async def async_step_init(self, user_input=None):
                     self._devices[idmac] = {CONF_MAC: idmac, CONF_NAME: name}
 
         # sort devices by name
-        sorteddev_tuples = sorted(self._devices.items(), key=lambda item: item[1]["name"])
+        sorteddev_tuples = sorted(self._devices.items(), key=lambda item: item[1].get("name", item[1]["mac"]))
         self._devices = dict(sorteddev_tuples)
         self.hass.config_entries.async_update_entry(
             self.config_entry,