diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py index 66be57d1390..a9284129c52 100644 --- a/homeassistant/components/esphome/config_flow.py +++ b/homeassistant/components/esphome/config_flow.py @@ -535,7 +535,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN): self._reconfig_entry, data=self._reconfig_entry.data | self._async_make_config_data(), ) - if self._reconfig_entry.data[CONF_DEVICE_NAME] == self._device_name: + if self._reconfig_entry.data.get(CONF_DEVICE_NAME) == self._device_name: self._entry_with_name_conflict = self._reconfig_entry return await self.async_step_name_conflict() return self.async_abort(