diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx
index 2e5af7bbf..34a342619 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx
@@ -162,7 +162,13 @@ export default function Page() {
   const usernameForEnv = user.id !== run.environment.userId ? run.environment.userName : undefined;
 
   const initialLoad = !isUpToDate && !trace;
-  const inspectorSpanId = trace && !initialLoad ? selectedSpanId : run.spanId;
+
+  let inspectorSpanId = selectedSpanId;
+  if (!inspectorSpanId) {
+    if (initialLoad || !trace) {
+      inspectorSpanId = run.spanId;
+    }
+  }
 
   return (
     <>