diff --git a/frontend/src/components/panels/TaskAttemptPanel.tsx b/frontend/src/components/panels/TaskAttemptPanel.tsx
index 00d327a8..125928bc 100644
--- a/frontend/src/components/panels/TaskAttemptPanel.tsx
+++ b/frontend/src/components/panels/TaskAttemptPanel.tsx
@@ -25,10 +25,12 @@ const TaskAttemptPanel = ({
   }
 
   return (
-    <EntriesProvider>
+    <EntriesProvider key={attempt.id}>
       <RetryUiProvider attemptId={attempt.id}>
         {children({
-          logs: <VirtualizedList attempt={attempt} task={task} />,
+          logs: (
+            <VirtualizedList key={attempt.id} attempt={attempt} task={task} />
+          ),
           followUp: (
             <TaskFollowUpSection task={task} selectedAttemptId={attempt.id} />
           ),
diff --git a/frontend/src/components/tasks/TaskFollowUpSection.tsx b/frontend/src/components/tasks/TaskFollowUpSection.tsx
index 2afba08b..ecd01b65 100644
--- a/frontend/src/components/tasks/TaskFollowUpSection.tsx
+++ b/frontend/src/components/tasks/TaskFollowUpSection.tsx
@@ -599,8 +599,14 @@ export function TaskFollowUpSection({
     refetchAttemptBranch,
   ]);
 
-  if (!selectedAttemptId) {
-    return null;
+  if (!selectedAttemptId) return null;
+
+  if (isScratchLoading) {
+    return (
+      <div className="flex items-center justify-center h-full">
+        <Loader2 className="animate-spin h-6 w-6" />
+      </div>
+    );
   }
 
   return (
diff --git a/frontend/src/hooks/useTaskAttempt.ts b/frontend/src/hooks/useTaskAttempt.ts
index 0a465226..43dcd789 100644
--- a/frontend/src/hooks/useTaskAttempt.ts
+++ b/frontend/src/hooks/useTaskAttempt.ts
@@ -6,6 +6,5 @@ export function useTaskAttempt(attemptId?: string) {
     queryKey: ['taskAttempt', attemptId],
     queryFn: () => attemptsApi.get(attemptId!),
     enabled: !!attemptId,
-    placeholderData: (previousData) => previousData,
   });
 }
diff --git a/frontend/src/pages/ProjectTasks.tsx b/frontend/src/pages/ProjectTasks.tsx
index 86898dc3..aa237411 100644
--- a/frontend/src/pages/ProjectTasks.tsx
+++ b/frontend/src/pages/ProjectTasks.tsx
@@ -287,7 +287,7 @@ export function ProjectTasks() {
   }, [projectId, taskId, isLoading, selectedTask, navigate]);
 
   const effectiveAttemptId = attemptId === 'latest' ? undefined : attemptId;
-  const isTaskView = !!taskId && !effectiveAttemptId && attemptId !== 'latest';
+  const isTaskView = !!taskId && !effectiveAttemptId;
   const { data: attempt } = useTaskAttempt(effectiveAttemptId);
 
   const { data: branchStatus } = useBranchStatus(attempt?.id);