diff --git a/homeassistant/components/enphase_envoy/__init__.py b/homeassistant/components/enphase_envoy/__init__.py
index f6438230789d6d..ba590fa0337beb 100644
--- a/homeassistant/components/enphase_envoy/__init__.py
+++ b/homeassistant/components/enphase_envoy/__init__.py
@@ -60,8 +60,16 @@ async def async_remove_config_entry_device(
     envoy_serial_num = config_entry.unique_id
     if envoy_serial_num in dev_ids:
         return False
-    if envoy_data and envoy_data.inverters:
-        for inverter in envoy_data.inverters:
-            if str(inverter) in dev_ids:
+    if envoy_data:
+        if envoy_data.inverters:
+            for inverter in envoy_data.inverters:
+                if str(inverter) in dev_ids:
+                    return False
+        if envoy_data.encharge_inventory:
+            for encharge in envoy_data.encharge_inventory:
+                if str(encharge) in dev_ids:
+                    return False
+        if envoy_data.enpower:
+            if str(envoy_data.enpower.serial_number) in dev_ids:
                 return False
     return True