diff --git a/src/mcp_agent/executor/temporal/system_activities.py b/src/mcp_agent/executor/temporal/system_activities.py
index c065ea9fa..024632d79 100644
--- a/src/mcp_agent/executor/temporal/system_activities.py
+++ b/src/mcp_agent/executor/temporal/system_activities.py
@@ -65,6 +65,7 @@ async def relay_notify(
     ) -> bool:
         gateway_url = getattr(self.context, "gateway_url", None)
         gateway_token = getattr(self.context, "gateway_token", None)
+
         return await notify_via_proxy(
             execution_id=execution_id,
             method=method,
diff --git a/src/mcp_agent/server/app_server.py b/src/mcp_agent/server/app_server.py
index 6dbdbd376..5e289a5e5 100644
--- a/src/mcp_agent/server/app_server.py
+++ b/src/mcp_agent/server/app_server.py
@@ -1400,6 +1400,9 @@ async def _workflow_run(
             # Prefer explicit kwargs, else infer from request context/headers
             gateway_url = kwargs.get("gateway_url")
             gateway_token = kwargs.get("gateway_token")
+            if gateway_token is None:
+                if app and app.config and app.config.temporal:
+                    gateway_token = app.config.temporal.api_key
 
             req = getattr(ctx.request_context, "request", None)
             if req is not None: