diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index 283d09e7919..ad18e681021 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -94,7 +94,8 @@ class EsphomeFlowHandler(config_entries.ConfigFlow):
                 data = self.hass.data[DATA_KEY][
                     entry.entry_id]  # type: RuntimeEntryData
                 # Node names are unique in the network
-                already_configured = data.device_info.name == node_name
+                if data.device_info is not None:
+                    already_configured = data.device_info.name == node_name
 
             if already_configured:
                 return self.async_abort(