diff --git a/agentex-ui/app/agentex-ui-root.tsx b/agentex-ui/app/agentex-ui-root.tsx
index 18b4579..0beaac3 100644
--- a/agentex-ui/app/agentex-ui-root.tsx
+++ b/agentex-ui/app/agentex-ui-root.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Suspense, useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { ToastContainer } from 'react-toastify';
 
@@ -70,18 +70,16 @@ export function AgentexUIRoot({
         sgpAppURL={sgpAppURL ?? ''}
         agentexAPIBaseURL={agentexAPIBaseURL}
       >
-        <Suspense fallback={<div>Loading...</div>}>
-          <div className="fixed inset-0 flex w-full">
-            <TaskSidebar />
-            <PrimaryContent
-              isTracesSidebarOpen={isTracesSidebarOpen}
-              toggleTracesSidebar={() =>
-                setIsTracesSidebarOpen(!isTracesSidebarOpen)
-              }
-            />
-            <TracesSidebar isOpen={isTracesSidebarOpen} />
-          </div>
-        </Suspense>
+        <div className="fixed inset-0 flex w-full">
+          <TaskSidebar />
+          <PrimaryContent
+            isTracesSidebarOpen={isTracesSidebarOpen}
+            toggleTracesSidebar={() =>
+              setIsTracesSidebarOpen(!isTracesSidebarOpen)
+            }
+          />
+          <TracesSidebar isOpen={isTracesSidebarOpen} />
+        </div>
       </AgentexProvider>
       <ToastContainer />
     </QueryProvider>
diff --git a/agentex-ui/components/agentex/task-sidebar.tsx b/agentex-ui/components/agentex/task-sidebar.tsx
index 8a2aed4..67c7cec 100644
--- a/agentex-ui/components/agentex/task-sidebar.tsx
+++ b/agentex-ui/components/agentex/task-sidebar.tsx
@@ -36,13 +36,19 @@ function TaskButton({ task }: TaskButtonProps) {
   const { taskID, updateParams } = useSafeSearchParams();
   const taskName = createTaskName(task);
 
+  const firstAgentName = useMemo(
+    () => task.agents?.[0]?.name ?? null,
+    [task.agents]
+  );
+
   const handleTaskSelect = useCallback(
     (taskID: TaskListResponse.TaskListResponseItem['id']) => {
       updateParams({
         [SearchParamKey.TASK_ID]: taskID,
+        [SearchParamKey.AGENT_NAME]: firstAgentName,
       });
     },
-    [updateParams]
+    [updateParams, firstAgentName]
   );
 
   const createdAtString = useMemo(
diff --git a/agentex-ui/components/providers/task-provider.tsx b/agentex-ui/components/providers/task-provider.tsx
index 2e46c6b..de35962 100644
--- a/agentex-ui/components/providers/task-provider.tsx
+++ b/agentex-ui/components/providers/task-provider.tsx
@@ -10,11 +10,9 @@ import { useTaskSubscription } from '@/hooks/use-task-subscription';
 export function TaskProvider({
   taskId,
   children,
-  fallback,
 }: {
   taskId: string;
   children: ReactNode;
-  fallback?: ReactNode;
 }) {
   const { agentexClient } = useAgentexClient();
   const { agentName } = useSafeSearchParams();
@@ -28,9 +26,5 @@ export function TaskProvider({
     enabled: !!taskId && agent?.acp_type === 'agentic',
   });
 
-  if (!taskId && fallback) {
-    return <>{fallback}</>;
-  }
-
   return <>{children}</>;
 }