diff --git a/skyvern-frontend/src/api/types.ts b/skyvern-frontend/src/api/types.ts
index 9fb10f31..d8363daa 100644
--- a/skyvern-frontend/src/api/types.ts
+++ b/skyvern-frontend/src/api/types.ts
@@ -55,7 +55,7 @@ export type StepApiResponse = {
   is_last: boolean;
   order: number;
   organization_id: string;
-  output: {
+  output?: {
     actions_and_results: ActionAndResultApiResponse[];
     errors: unknown[];
   };
diff --git a/skyvern-frontend/src/routes/tasks/detail/TaskActions.tsx b/skyvern-frontend/src/routes/tasks/detail/TaskActions.tsx
index b0a06b68..4a3b0159 100644
--- a/skyvern-frontend/src/routes/tasks/detail/TaskActions.tsx
+++ b/skyvern-frontend/src/routes/tasks/detail/TaskActions.tsx
@@ -13,7 +13,7 @@ function TaskActions() {
 
   const activeAction = data?.[selectedActionIndex];
 
-  if (isFetching || !data) {
+  if (isFetching) {
     return (
       <div className="flex gap-2">
         <div className="h-[40rem] w-3/4">
@@ -26,8 +26,12 @@ function TaskActions() {
     );
   }
 
+  if (!data) {
+    return <div>No actions</div>;
+  }
+
   if (!activeAction) {
-    return <div>No action</div>;
+    return <div>No active action</div>;
   }
 
   return (
diff --git a/skyvern-frontend/src/routes/tasks/detail/useActions.tsx b/skyvern-frontend/src/routes/tasks/detail/useActions.tsx
index d8a579d3..fe9a0790 100644
--- a/skyvern-frontend/src/routes/tasks/detail/useActions.tsx
+++ b/skyvern-frontend/src/routes/tasks/detail/useActions.tsx
@@ -53,7 +53,7 @@ function useActions(taskId: string): {
 
   const actions = stepsQuery.data
     ?.map((step) => {
-      const actionsAndResults = step.output.actions_and_results;
+      const actionsAndResults = step.output?.actions_and_results ?? [];
 
       const actions = actionsAndResults.map((actionAndResult, index) => {
         const action = actionAndResult[0];
diff --git a/skyvern-frontend/src/routes/tasks/running/QueuedTasks.tsx b/skyvern-frontend/src/routes/tasks/running/QueuedTasks.tsx
index fe1f633f..8aa5b161 100644
--- a/skyvern-frontend/src/routes/tasks/running/QueuedTasks.tsx
+++ b/skyvern-frontend/src/routes/tasks/running/QueuedTasks.tsx
@@ -55,7 +55,7 @@ function QueuedTasks() {
                   key={task.task_id}
                   className="w-4"
                   onClick={() => {
-                    navigate(task.task_id);
+                    navigate(`${task.task_id}/actions`);
                   }}
                 >
                   <TableCell className="w-1/4">{task.task_id}</TableCell>
diff --git a/skyvern-frontend/src/routes/tasks/running/RunningTasks.tsx b/skyvern-frontend/src/routes/tasks/running/RunningTasks.tsx
index 46ea2603..c9eb757d 100644
--- a/skyvern-frontend/src/routes/tasks/running/RunningTasks.tsx
+++ b/skyvern-frontend/src/routes/tasks/running/RunningTasks.tsx
@@ -42,7 +42,7 @@ function RunningTasks() {
         key={task.task_id}
         className="hover:bg-muted/50 cursor-pointer"
         onClick={() => {
-          navigate(`/tasks/${task.task_id}`);
+          navigate(`/tasks/${task.task_id}/actions`);
         }}
       >
         <CardHeader>