diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 149347f18f..ce7a94103e 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -1,10 +1,11 @@
-import { Button, ConfigProvider, notification, Typography, theme } from "antd";
+import { Button, ConfigProvider, notification, theme } from "antd";
 import axios from "axios";
 import { useEffect } from "react";
 import { HelmetProvider } from "react-helmet-async";
 import { BrowserRouter } from "react-router-dom";
 import { GenericLoader } from "./components/generic-loader/GenericLoader";
 import CustomMarkdown from "./components/helpers/custom-markdown/CustomMarkdown.jsx";
+import { NotificationIdLine } from "./components/notification/NotificationIdLine.jsx";
 import { PageTitle } from "./components/widgets/page-title/PageTitle.jsx";
 import { THEME } from "./helpers/GetStaticData.js";
 import { attachRequestIdInterceptor } from "./helpers/requestId.js";
@@ -63,20 +64,22 @@ function App() {
 
     const showRequestId =
       alertDetails?.type === "error" && alertDetails?.requestId;
+    const showExecutionId = Boolean(alertDetails?.executionId);
     const description = (
       <>
         <CustomMarkdown text={alertDetails?.content} />
+        {showExecutionId && (
+          <NotificationIdLine
+            label="Execution ID"
+            value={alertDetails?.executionId}
+            stacked
+          />
+        )}
         {showRequestId && (
-          <div className="notification-request-id">
-            <Typography.Text type="secondary">Request ID:</Typography.Text>{" "}
-            <Typography.Text
-              code
-              copyable={{ text: alertDetails?.requestId }}
-              className="notification-request-id__value"
-            >
-              {alertDetails?.requestId}
-            </Typography.Text>
-          </div>
+          <NotificationIdLine
+            label="Request ID"
+            value={alertDetails?.requestId}
+          />
         )}
       </>
     );
@@ -90,8 +93,14 @@ function App() {
       key: alertDetails?.key,
     });
 
-    const logMessage = showRequestId
-      ? `${alertDetails.content}\nRequest ID: \`${alertDetails.requestId}\``
+    const logSuffix = [
+      showExecutionId && `Execution ID: \`${alertDetails.executionId}\``,
+      showRequestId && `Request ID: \`${alertDetails.requestId}\``,
+    ]
+      .filter(Boolean)
+      .join("\n");
+    const logMessage = logSuffix
+      ? `${alertDetails.content}\n${logSuffix}`
       : alertDetails.content;
 
     pushLogMessages([
diff --git a/frontend/src/components/agency/agency/Agency.jsx b/frontend/src/components/agency/agency/Agency.jsx
index de90e8d136..5fe5ec3a90 100644
--- a/frontend/src/components/agency/agency/Agency.jsx
+++ b/frontend/src/components/agency/agency/Agency.jsx
@@ -778,6 +778,16 @@ function Agency() {
       const execIdValue = initialRes?.data?.execution_id;
 
       setExecutionId(execIdValue);
+      if (execIdValue && !isStepExecution) {
+        // Live progress on this page is stale; point users at the logs page.
+        setAlertDetails({
+          type: "info",
+          title: "Workflow run started",
+          content: `[View logs](/logs/WF/${execIdValue}) to track progress`,
+          executionId: execIdValue,
+          duration: 0,
+        });
+      }
       body["execution_id"] = execIdValue;
       if (isStepExecution) {
         body["execution_action"] = wfExecutionTypes[executionAction];
diff --git a/frontend/src/components/logging/detailed-logs/DetailedLogs.jsx b/frontend/src/components/logging/detailed-logs/DetailedLogs.jsx
index b7870942d7..3ff0034238 100644
--- a/frontend/src/components/logging/detailed-logs/DetailedLogs.jsx
+++ b/frontend/src/components/logging/detailed-logs/DetailedLogs.jsx
@@ -1,5 +1,4 @@
 import {
-  ArrowLeftOutlined,
   CalendarOutlined,
   ClockCircleOutlined,
   CloseCircleFilled,
@@ -24,12 +23,11 @@ import {
 } from "antd";
 import PropTypes from "prop-types";
 import { useEffect, useRef, useState } from "react";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 
 import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
 import { useExceptionHandler } from "../../../hooks/useExceptionHandler";
 import { useAlertStore } from "../../../store/alert-store";
-import { useSessionStore } from "../../../store/session-store";
 import "./DetailedLogs.css";
 import {
   formattedDateTime,
@@ -93,12 +91,8 @@ const DetailedLogs = () => {
   const axiosPrivate = useAxiosPrivate();
   const { setAlertDetails } = useAlertStore();
   const handleException = useExceptionHandler();
-  const navigate = useNavigate();
-  const location = useLocation();
-  const { sessionDetails } = useSessionStore();
   const { getUrl } = useRequestUrl();
   const copyToClipboard = useCopyToClipboard();
-  const cameFromDashboard = location.state?.from === "dashboard";
 
   const [executionDetails, setExecutionDetails] = useState();
   const [executionFiles, setExecutionFiles] = useState();
@@ -460,18 +454,6 @@ const DetailedLogs = () => {
     <div className="detailed-logs-container">
       <div className="detailed-logs-header">
         <Typography.Title className="logs-title" level={4}>
-          <Button
-            type="text"
-            shape="circle"
-            icon={<ArrowLeftOutlined />}
-            onClick={() =>
-              navigate(
-                cameFromDashboard
-                  ? `/${sessionDetails?.orgName}/dashboard`
-                  : `/${sessionDetails?.orgName}/logs`,
-              )
-            }
-          />
           {type} Execution ID {id}
           <Button
             className="copy-btn-outlined"
diff --git a/frontend/src/components/logging/execution-logs/ExecutionLogs.jsx b/frontend/src/components/logging/execution-logs/ExecutionLogs.jsx
index 8e44287e2d..b73ab94687 100644
--- a/frontend/src/components/logging/execution-logs/ExecutionLogs.jsx
+++ b/frontend/src/components/logging/execution-logs/ExecutionLogs.jsx
@@ -16,6 +16,7 @@ import {
   formattedDateTimeWithSeconds,
 } from "../../../helpers/GetStaticData";
 import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
+import { useBackNavigation } from "../../../hooks/useBackNavigation";
 import { useExceptionHandler } from "../../../hooks/useExceptionHandler";
 import useRequestUrl from "../../../hooks/useRequestUrl";
 import { useAlertStore } from "../../../store/alert-store";
@@ -49,19 +50,9 @@ function ExecutionLogs() {
   const autoRefreshIntervalRef = useRef(null);
   const currentPath = location.pathname !== `/${sessionDetails?.orgName}/logs`;
 
-  // Compute back route - use location state if available, otherwise default to logs listing
-  const backRoute = id
-    ? location.state?.from || `/${sessionDetails?.orgName}/logs`
-    : null;
-
-  // Scroll-restoration wins; otherwise preserve caller's upstream UI state.
-  const backRouteState =
-    id && location.state?.scrollToCardId
-      ? {
-          scrollToCardId: location.state.scrollToCardId,
-          cardExpanded: location.state.cardExpanded,
-        }
-      : location.state?.backRouteState || null;
+  const handleNavigateBack = useBackNavigation(
+    `/${sessionDetails?.orgName}/logs`,
+  );
 
   const items = [
     {
@@ -220,8 +211,7 @@ function ExecutionLogs() {
         title={"Execution Logs"}
         customButtons={logTabs}
         enableSearch={false}
-        previousRoute={backRoute}
-        previousRouteState={backRouteState}
+        onNavigateBack={id ? handleNavigateBack : undefined}
       />
       <div className="file-log-layout">
         {id ? (
diff --git a/frontend/src/components/metrics-dashboard/RecentActivity.jsx b/frontend/src/components/metrics-dashboard/RecentActivity.jsx
index f6f1ad5104..f21053f25f 100644
--- a/frontend/src/components/metrics-dashboard/RecentActivity.jsx
+++ b/frontend/src/components/metrics-dashboard/RecentActivity.jsx
@@ -84,7 +84,7 @@ function RecentActivity({ data, loading }) {
     }
     const typeConfig = TYPE_CONFIG[item.type] || TYPE_CONFIG.workflow;
     navigate(`/${orgName}/logs/${typeConfig.logType}/${item.execution_id}`, {
-      state: { from: "dashboard" },
+      state: { from: `/${orgName}/dashboard` },
     });
   };
 
diff --git a/frontend/src/components/notification/NotificationIdLine.jsx b/frontend/src/components/notification/NotificationIdLine.jsx
new file mode 100644
index 0000000000..7e7739ddf8
--- /dev/null
+++ b/frontend/src/components/notification/NotificationIdLine.jsx
@@ -0,0 +1,31 @@
+import { Typography } from "antd";
+import PropTypes from "prop-types";
+
+function NotificationIdLine({ label, value, stacked = false }) {
+  if (!value) {
+    return null;
+  }
+  const className = stacked
+    ? "notification-id-line notification-id-line--stacked"
+    : "notification-id-line";
+  return (
+    <div className={className}>
+      <Typography.Text type="secondary">{label}:</Typography.Text>
+      <Typography.Text
+        code
+        copyable={{ text: value }}
+        className="notification-id-line__value"
+      >
+        {value}
+      </Typography.Text>
+    </div>
+  );
+}
+
+NotificationIdLine.propTypes = {
+  label: PropTypes.string.isRequired,
+  value: PropTypes.string,
+  stacked: PropTypes.bool,
+};
+
+export { NotificationIdLine };
diff --git a/frontend/src/hooks/useBackNavigation.js b/frontend/src/hooks/useBackNavigation.js
new file mode 100644
index 0000000000..1c8f8a795e
--- /dev/null
+++ b/frontend/src/hooks/useBackNavigation.js
@@ -0,0 +1,41 @@
+import { useCallback } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+
+/*
+  Generic back-navigation for pages reached from multiple callsites.
+
+  Priority:
+   1. location.state.from   — explicit hint from the linking page (also
+      reinjects scrollToCardId / backRouteState so list pages can restore
+      scroll position on return).
+   2. navigate(-1)          — SPA history exists; pop one entry. Covers
+      callsites that didn't set state (e.g. markdown links in alerts).
+   3. fallbackPath          — deep link / refresh with no history.
+*/
+function useBackNavigation(fallbackPath, fallbackState = null) {
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  return useCallback(() => {
+    const explicitFrom = location.state?.from;
+    if (explicitFrom) {
+      const restoredState = location.state?.scrollToCardId
+        ? {
+            scrollToCardId: location.state.scrollToCardId,
+            cardExpanded: location.state.cardExpanded,
+          }
+        : location.state?.backRouteState || null;
+      navigate(explicitFrom, { state: restoredState });
+      return;
+    }
+    if (location.key !== "default") {
+      navigate(-1);
+      return;
+    }
+    if (fallbackPath) {
+      navigate(fallbackPath, { state: fallbackState });
+    }
+  }, [location.key, location.state, navigate, fallbackPath, fallbackState]);
+}
+
+export { useBackNavigation };
diff --git a/frontend/src/index.css b/frontend/src/index.css
index aa670e91d8..023b47e579 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -252,12 +252,12 @@ body {
   z-index: 2000;
 }
 
-.notification-request-id,
-.notification-request-id__value {
+.notification-id-line,
+.notification-id-line__value {
   font-size: 12px;
 }
 
-.notification-request-id {
+.notification-id-line {
   margin-top: 8px;
   display: flex;
   align-items: center;
@@ -265,6 +265,12 @@ body {
   gap: 4px;
 }
 
-.notification-request-id__value {
+.notification-id-line--stacked {
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 2px;
+}
+
+.notification-id-line__value {
   word-break: break-all;
 }
diff --git a/frontend/src/store/alert-store.js b/frontend/src/store/alert-store.js
index 25827813ab..e957a0a8ba 100644
--- a/frontend/src/store/alert-store.js
+++ b/frontend/src/store/alert-store.js
@@ -14,6 +14,7 @@ const STORE_VARIABLES = {
     duration: DEFAULT_DURATION,
     key: null,
     requestId: null,
+    executionId: null,
   },
 };
 
diff --git a/workers/log_consumer/tasks.py b/workers/log_consumer/tasks.py
index 3eaa280858..e9eead8418 100644
--- a/workers/log_consumer/tasks.py
+++ b/workers/log_consumer/tasks.py
@@ -3,6 +3,7 @@
 This module contains Celery tasks for processing execution logs.
 """
 
+import json
 import os
 from typing import Any
 from urllib.parse import quote
@@ -107,7 +108,10 @@ def logs_consumer(**kwargs: Any) -> None:
 
     # Emit WebSocket event directly through Socket.IO (via Redis broker)
     try:
-        payload = {"data": log_message}
+        # Coerce UUID/datetime/etc. to JSON-safe primitives — Socket.IO's
+        # serializer is stdlib json and chokes on non-primitive types.
+        safe_message = json.loads(json.dumps(log_message, default=str))
+        payload = {"data": safe_message}
         sio.emit(event, data=payload, room=room)
         logger.debug(f"WebSocket event emitted successfully for room {room}")
     except Exception as e: