diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index 6a238ff84b1..62d46500451 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -542,6 +542,7 @@ class Entity(ABC):
         data = event.data
         if data["action"] == "remove" and data["entity_id"] == self.entity_id:
             await self.async_removed_from_registry()
+            await self.async_remove()
 
         if (
             data["action"] != "update"