diff --git a/unraid_mcp/tools/notifications.py b/unraid_mcp/tools/notifications.py
index 9582ee7..67aa2cb 100644
--- a/unraid_mcp/tools/notifications.py
+++ b/unraid_mcp/tools/notifications.py
@@ -6,11 +6,21 @@ creating, archiving, and deleting system notifications.
 
 from typing import Any, Literal, get_args
 
+from fastmcp import Context as _Context
 from fastmcp import FastMCP
 
 from ..config.logging import logger
 from ..core.client import make_graphql_request
+from ..core.exceptions import CredentialsNotConfiguredError as _CredErr
 from ..core.exceptions import ToolError, tool_error_handler
+from ..core.setup import elicit_and_configure as _elicit
+
+
+# Re-export at module scope so tests can patch "unraid_mcp.tools.notifications.elicit_and_configure"
+# and "unraid_mcp.tools.notifications.CredentialsNotConfiguredError"
+elicit_and_configure = _elicit
+CredentialsNotConfiguredError = _CredErr
+Context = _Context
 
 
 QUERIES: dict[str, str] = {
@@ -168,6 +178,7 @@ def register_notifications_tool(mcp: FastMCP) -> None:
         title: str | None = None,
         subject: str | None = None,
         description: str | None = None,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """Manage Unraid system notifications.
 
@@ -217,7 +228,15 @@ def register_notifications_tool(mcp: FastMCP) -> None:
             logger.info(f"Executing unraid_notifications action={action}")
 
             if action == "overview":
-                data = await make_graphql_request(QUERIES["overview"])
+                try:
+                    data = await make_graphql_request(QUERIES["overview"])
+                except CredentialsNotConfiguredError:
+                    configured = await elicit_and_configure(ctx)
+                    if not configured:
+                        raise ToolError(
+                            "Credentials required. Run `unraid_health action=setup` to configure."
+                        )
+                    data = await make_graphql_request(QUERIES["overview"])
                 notifications = data.get("notifications") or {}
                 return dict(notifications.get("overview") or {})