From a061f56833b57ec0446d21449455ceea1215862c Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Fri, 14 Apr 2023 06:37:49 +0200
Subject: [PATCH] Fix lingering timer in EntityRegistryDisabledHandler (#91376)

Mark EntityRegistryDisabledHandler as cancellable
---
 homeassistant/config_entries.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 3731f5fa9ae..ff95d3513dc 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -20,7 +20,7 @@ from . import data_entry_flow, loader
 from .backports.enum import StrEnum
 from .components import persistent_notification
 from .const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP, Platform
-from .core import CALLBACK_TYPE, CoreState, Event, HomeAssistant, callback
+from .core import CALLBACK_TYPE, CoreState, Event, HassJob, HomeAssistant, callback
 from .data_entry_flow import FlowResult
 from .exceptions import (
     ConfigEntryAuthFailed,
@@ -1965,7 +1965,9 @@ class EntityRegistryDisabledHandler:
             self._remove_call_later()
 
         self._remove_call_later = async_call_later(
-            self.hass, RELOAD_AFTER_UPDATE_DELAY, self._handle_reload
+            self.hass,
+            RELOAD_AFTER_UPDATE_DELAY,
+            HassJob(self._handle_reload, cancel_on_shutdown=True),
         )
 
     async def _handle_reload(self, _now: Any) -> None: