diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx
index 9635162f1..46fccf631 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx
@@ -47,6 +47,7 @@ export const handle: Handle = {
   breadcrumb: (match, matches) => {
     const jobMatch = matches.find((m) => m.id === jobMatchId);
     const runData = useTypedMatchData<typeof loader>(match);
+
     return (
       <Fragment>
         <BreadcrumbLink
@@ -54,7 +55,7 @@ export const handle: Handle = {
           title="Runs"
         />
         <BreadcrumbIcon />
-        {runData && (
+        {runData && runData.run && (
           <BreadcrumbLink
             to={match.pathname}
             title={`Run #${runData.run.number}`}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.triggers_.external.$triggerParam_.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.triggers_.external.$triggerParam_.runs.$runParam/route.tsx
index 491ebc78d..d37fc0c50 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.triggers_.external.$triggerParam_.runs.$runParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.triggers_.external.$triggerParam_.runs.$runParam/route.tsx
@@ -15,13 +15,12 @@ import { requireUserId } from "~/services/session.server";
 import { Handle } from "~/utils/handle";
 import {
   TriggerSourceRunParamsSchema,
-  projectTriggersPath,
-  runStreamingPath,
   externalTriggerPath,
   externalTriggerRunPath,
   externalTriggerRunStreamingPath,
-  trimTrailingSlash,
   externalTriggerRunsParentPath,
+  projectTriggersPath,
+  trimTrailingSlash,
 } from "~/utils/pathBuilder";
 
 export const loader = async ({ request, params }: LoaderArgs) => {
@@ -89,10 +88,12 @@ export const handle: Handle = {
           title={`${data.trigger.integration.title}: ${data.trigger.integration.slug}`}
         />
         <BreadcrumbIcon />
-        <BreadcrumbLink
-          to={trimTrailingSlash(match.pathname)}
-          title={`Run #${data.run.number}`}
-        />
+        {data && data.run && (
+          <BreadcrumbLink
+            to={trimTrailingSlash(match.pathname)}
+            title={`Run #${data.run.number}`}
+          />
+        )}
       </Fragment>
     );
   },