diff --git a/custom_components/alexa_media/__init__.py b/custom_components/alexa_media/__init__.py
index f6889f78..2bcfdd01 100644
--- a/custom_components/alexa_media/__init__.py
+++ b/custom_components/alexa_media/__init__.py
@@ -636,9 +636,14 @@ async def async_update_data() -> Optional[AlexaEntityData]:
                 )
                 if not entry_setup:
                     _LOGGER.debug("Loading config entry for %s", component)
-                    await hass.config_entries.async_forward_entry_setups(
-                        config_entry, [component]
-                    )
+                    try:
+                        await hass.config_entries.async_forward_entry_setups(
+                            config_entry, [component]
+                        )
+                    except (asyncio.TimeoutError, TimeoutException) as ex:
+                        raise ConfigEntryNotReady(
+                            f"Timeout while loading config entry for {component}"
+                        ) from ex
                 else:
                     _LOGGER.debug("Loading %s", component)
                     hass.async_create_task(