diff --git a/homeassistant/components/nut/__init__.py b/homeassistant/components/nut/__init__.py
index 1a040b99f57..cb68e8d3328 100644
--- a/homeassistant/components/nut/__init__.py
+++ b/homeassistant/components/nut/__init__.py
@@ -29,7 +29,6 @@ from .const import (
     PLATFORMS,
     PYNUT_DATA,
     PYNUT_UNIQUE_ID,
-    UNDO_UPDATE_LISTENER,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -80,7 +79,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     _LOGGER.debug("NUT Sensors Available: %s", status)
 
-    undo_listener = entry.add_update_listener(_async_update_listener)
+    entry.async_on_unload(entry.add_update_listener(_async_update_listener))
     unique_id = _unique_id_from_status(status)
     if unique_id is None:
         unique_id = entry.entry_id
@@ -90,7 +89,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         COORDINATOR: coordinator,
         PYNUT_DATA: data,
         PYNUT_UNIQUE_ID: unique_id,
-        UNDO_UPDATE_LISTENER: undo_listener,
     }
 
     device_registry = dr.async_get(hass)
@@ -108,6 +106,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+    return unload_ok
+
+
 async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry):
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
@@ -165,18 +170,6 @@ def _unique_id_from_status(status):
     return "_".join(unique_id_group)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    hass.data[DOMAIN][entry.entry_id][UNDO_UPDATE_LISTENER]()
-
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
-
-
 class PyNUTData:
     """Stores the data retrieved from NUT.
 
diff --git a/homeassistant/components/nut/const.py b/homeassistant/components/nut/const.py
index ffb21a545bb..9f6b43974b7 100644
--- a/homeassistant/components/nut/const.py
+++ b/homeassistant/components/nut/const.py
@@ -26,8 +26,6 @@ DOMAIN = "nut"
 
 PLATFORMS = [Platform.SENSOR]
 
-UNDO_UPDATE_LISTENER = "undo_update_listener"
-
 DEFAULT_NAME = "NUT UPS"
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 3493