diff --git a/custom_components/alexa_media/media_player.py b/custom_components/alexa_media/media_player.py
index e2ce6ab6..b5455f9b 100644
--- a/custom_components/alexa_media/media_player.py
+++ b/custom_components/alexa_media/media_player.py
@@ -181,9 +181,14 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
                 _LOGGER.debug(
                     "%s: Loading config entry for %s", hide_email(account), 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
         return True
     raise ConfigEntryNotReady