diff --git a/web/components/ExecutionsView.tsx b/web/components/ExecutionsView.tsx
index 501b4c0..e402335 100644
--- a/web/components/ExecutionsView.tsx
+++ b/web/components/ExecutionsView.tsx
@@ -290,13 +290,13 @@ ${JSON.stringify(execution.result_summary || {}, null, 2)}
 
           return (
             <div className="flex items-center gap-2">
-              {/* Analytics button - only for completed */}
-              {isCompleted && (
+              {/* Analytics button - only for completed with job_id */}
+              {isCompleted && execution.job_id && (
                 <Link
-                  href={`/pipelines/${pipelineId}?execution_id=${execution.id}`}
+                  href={`/analytics/${execution.job_id}`}
                   className="inline-flex items-center gap-1 px-2 py-1 bg-purple-100 hover:bg-purple-200 text-purple-700 text-xs font-medium rounded transition-colors"
                   onClick={(e) => e.stopPropagation()}
-                  title="View Analytics"
+                  title="View Job Analytics"
                 >
                   <svg className="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z" />