diff --git a/apps/web/app/task/[id]/page-client.tsx b/apps/web/app/task/[id]/page-client.tsx
index dcbd782376..215b20cb27 100644
--- a/apps/web/app/task/[id]/page-client.tsx
+++ b/apps/web/app/task/[id]/page-client.tsx
@@ -82,13 +82,14 @@ export default function TaskPage({ task }: TaskPageClientProps) {
   const [leftTab, setLeftTab] = useState('chat');
   const [selectedDiffPath, setSelectedDiffPath] = useState<string | null>(null);
   const [notes, setNotes] = useState('');
-  const branchesRequest = useRequest(async (workspaceId: string, repoPath: string) => {
+  const fetchBranches = useCallback(async (workspaceId: string, repoPath: string) => {
     const response = await listRepositories(getBackendConfig().apiBaseUrl, workspaceId);
     const repo = response.repositories.find((item) => item.local_path === repoPath);
     if (!repo) return [];
     const branchResponse = await listRepositoryBranches(getBackendConfig().apiBaseUrl, repo.id);
     return branchResponse.branches;
-  });
+  }, []);
+  const branchesRequest = useRequest(fetchBranches);
 
   const activeChat = chats[0];
 
@@ -116,7 +117,7 @@ export default function TaskPage({ task }: TaskPageClientProps) {
   useEffect(() => {
     if (!task?.workspace_id || !task.repository_url) return;
     branchesRequest.run(task.workspace_id, task.repository_url).catch(() => {});
-  }, [branchesRequest, task?.repository_url, task?.workspace_id]);
+  }, [branchesRequest.run, task?.repository_url, task?.workspace_id]);
 
   return (
     <TooltipProvider>
diff --git a/apps/web/components/ui/tooltip.tsx b/apps/web/components/ui/tooltip.tsx
index 4049ef81de..083f7e43d1 100644
--- a/apps/web/components/ui/tooltip.tsx
+++ b/apps/web/components/ui/tooltip.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from "react"
-import { Tooltip as TooltipPrimitive } from "radix-ui"
+import * as TooltipPrimitive from "@radix-ui/react-tooltip"
 
 import { cn } from "@/lib/utils"
 
@@ -21,11 +21,7 @@ function TooltipProvider({
 function Tooltip({
   ...props
 }: React.ComponentProps<typeof TooltipPrimitive.Root>) {
-  return (
-    <TooltipProvider>
-      <TooltipPrimitive.Root data-slot="tooltip" {...props} />
-    </TooltipProvider>
-  )
+  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />
 }
 
 function TooltipTrigger({