diff --git a/homeassistant/components/reolink/__init__.py b/homeassistant/components/reolink/__init__.py
index 56974d9ed83..f15ce90427c 100644
--- a/homeassistant/components/reolink/__init__.py
+++ b/homeassistant/components/reolink/__init__.py
@@ -80,7 +80,11 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         update_interval=timedelta(seconds=DEVICE_UPDATE_INTERVAL),
     )
     # Fetch initial data so we have data when entities subscribe
-    await coordinator_device_config_update.async_config_entry_first_refresh()
+    try:
+        await coordinator_device_config_update.async_config_entry_first_refresh()
+    except ConfigEntryNotReady as err:
+        await host.stop()
+        raise err
 
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = ReolinkData(
         host=host,
diff --git a/homeassistant/components/reolink/host.py b/homeassistant/components/reolink/host.py
index 582a52ae1ba..e44623e1a1e 100644
--- a/homeassistant/components/reolink/host.py
+++ b/homeassistant/components/reolink/host.py
@@ -250,7 +250,7 @@ class ReolinkHost:
 
     async def register_webhook(self) -> None:
         """Register the webhook for motion events."""
-        self.webhook_id = f"{DOMAIN}_{self.unique_id.replace(':', '')}"
+        self.webhook_id = f"{DOMAIN}_{self.unique_id.replace(':', '')}_ONVIF"
         event_id = self.webhook_id
 
         webhook.async_register(