diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
index e8574d4..9fc1ae0 100644
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@@ -7,7 +7,6 @@ import { type Metadata } from "next";
 import { Geist } from "next/font/google";
 
 import { ThemeProviderWrapper } from "~/components/deer-flow/theme-provider-wrapper";
-import { TooltipProvider } from "~/components/ui/tooltip";
 
 import { Toaster } from "../components/deer-flow/toaster";
 
@@ -29,9 +28,7 @@ export default function RootLayout({
   return (
     <html lang="en" className={`${geist.variable}`} suppressHydrationWarning>
       <body className="bg-app">
-        <ThemeProviderWrapper>
-          <TooltipProvider>{children}</TooltipProvider>
-        </ThemeProviderWrapper>
+        <ThemeProviderWrapper>{children}</ThemeProviderWrapper>
         <Toaster />
       </body>
     </html>
diff --git a/web/src/components/deer-flow/tooltip.tsx b/web/src/components/deer-flow/tooltip.tsx
index 8b2af38..e8a8065 100644
--- a/web/src/components/deer-flow/tooltip.tsx
+++ b/web/src/components/deer-flow/tooltip.tsx
@@ -6,6 +6,7 @@ import type { CSSProperties } from "react";
 import {
   Tooltip as ShadcnTooltip,
   TooltipContent,
+  TooltipProvider,
   TooltipTrigger,
 } from "~/components/ui/tooltip";
 import { cn } from "~/lib/utils";
@@ -28,16 +29,18 @@ export function Tooltip({
   sideOffset?: number;
 }) {
   return (
-    <ShadcnTooltip delayDuration={750} open={open}>
-      <TooltipTrigger asChild>{children}</TooltipTrigger>
-      <TooltipContent
-        className={cn(className)}
-        style={style}
-        side={side}
-        sideOffset={sideOffset}
-      >
-        {title}
-      </TooltipContent>
-    </ShadcnTooltip>
+    <TooltipProvider>
+      <ShadcnTooltip delayDuration={750} open={open}>
+        <TooltipTrigger asChild>{children}</TooltipTrigger>
+        <TooltipContent
+          className={cn(className)}
+          style={style}
+          side={side}
+          sideOffset={sideOffset}
+        >
+          {title}
+        </TooltipContent>
+      </ShadcnTooltip>
+    </TooltipProvider>
   );
 }
