diff --git a/homeassistant/components/gree/__init__.py b/homeassistant/components/gree/__init__.py
index ff3438ed53fbdd..13e93d780b26c0 100644
--- a/homeassistant/components/gree/__init__.py
+++ b/homeassistant/components/gree/__init__.py
@@ -11,7 +11,6 @@
 from .bridge import DiscoveryService
 from .const import (
     COORDINATORS,
-    DATA_DISCOVERY_INTERVAL,
     DATA_DISCOVERY_SERVICE,
     DISCOVERY_SCAN_INTERVAL,
     DISPATCHERS,
@@ -29,7 +28,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     gree_discovery = DiscoveryService(hass)
     hass.data[DATA_DISCOVERY_SERVICE] = gree_discovery
 
-    hass.data[DOMAIN].setdefault(DISPATCHERS, [])
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     async def _async_scan_update(_=None):
@@ -39,8 +37,10 @@ async def _async_scan_update(_=None):
     _LOGGER.debug("Scanning network for Gree devices")
     await _async_scan_update()
 
-    hass.data[DOMAIN][DATA_DISCOVERY_INTERVAL] = async_track_time_interval(
-        hass, _async_scan_update, timedelta(seconds=DISCOVERY_SCAN_INTERVAL)
+    entry.async_on_unload(
+        async_track_time_interval(
+            hass, _async_scan_update, timedelta(seconds=DISCOVERY_SCAN_INTERVAL)
+        )
     )
 
     return True
@@ -48,13 +48,6 @@ async def _async_scan_update(_=None):
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if hass.data[DOMAIN].get(DISPATCHERS) is not None:
-        for cleanup in hass.data[DOMAIN][DISPATCHERS]:
-            cleanup()
-
-    if hass.data[DOMAIN].get(DATA_DISCOVERY_INTERVAL) is not None:
-        hass.data[DOMAIN].pop(DATA_DISCOVERY_INTERVAL)()
-
     if hass.data.get(DATA_DISCOVERY_SERVICE) is not None:
         hass.data.pop(DATA_DISCOVERY_SERVICE)
 
diff --git a/homeassistant/components/gree/climate.py b/homeassistant/components/gree/climate.py
index b14b9cfaba48f4..ba162173724502 100644
--- a/homeassistant/components/gree/climate.py
+++ b/homeassistant/components/gree/climate.py
@@ -47,7 +47,6 @@
 from .const import (
     COORDINATORS,
     DISPATCH_DEVICE_DISCOVERED,
-    DISPATCHERS,
     DOMAIN,
     FAN_MEDIUM_HIGH,
     FAN_MEDIUM_LOW,
@@ -88,7 +87,7 @@
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Gree HVAC device from a config entry."""
@@ -101,7 +100,7 @@ def init_device(coordinator):
     for coordinator in hass.data[DOMAIN][COORDINATORS]:
         init_device(coordinator)
 
-    hass.data[DOMAIN][DISPATCHERS].append(
+    entry.async_on_unload(
         async_dispatcher_connect(hass, DISPATCH_DEVICE_DISCOVERED, init_device)
     )
 
diff --git a/homeassistant/components/gree/const.py b/homeassistant/components/gree/const.py
index b4df7a1acde5d8..46479210921411 100644
--- a/homeassistant/components/gree/const.py
+++ b/homeassistant/components/gree/const.py
@@ -3,7 +3,6 @@
 COORDINATORS = "coordinators"
 
 DATA_DISCOVERY_SERVICE = "gree_discovery"
-DATA_DISCOVERY_INTERVAL = "gree_discovery_interval"
 
 DISCOVERY_SCAN_INTERVAL = 300
 DISCOVERY_TIMEOUT = 8
diff --git a/homeassistant/components/gree/switch.py b/homeassistant/components/gree/switch.py
index 68c11ad6e1f458..7916df18abc233 100644
--- a/homeassistant/components/gree/switch.py
+++ b/homeassistant/components/gree/switch.py
@@ -17,7 +17,7 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import COORDINATORS, DISPATCH_DEVICE_DISCOVERED, DISPATCHERS, DOMAIN
+from .const import COORDINATORS, DISPATCH_DEVICE_DISCOVERED, DOMAIN
 from .entity import GreeEntity
 
 
@@ -102,7 +102,7 @@ def _set_anion(device: Device, value: bool) -> None:
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Gree HVAC device from a config entry."""
@@ -119,7 +119,7 @@ def init_device(coordinator):
     for coordinator in hass.data[DOMAIN][COORDINATORS]:
         init_device(coordinator)
 
-    hass.data[DOMAIN][DISPATCHERS].append(
+    entry.async_on_unload(
         async_dispatcher_connect(hass, DISPATCH_DEVICE_DISCOVERED, init_device)
     )