diff --git a/apps/www/components/examples/tooltip/demo.tsx b/apps/www/components/examples/tooltip/demo.tsx
index 33e24f75c..9c4d08b8c 100644
--- a/apps/www/components/examples/tooltip/demo.tsx
+++ b/apps/www/components/examples/tooltip/demo.tsx
@@ -6,21 +6,24 @@ import { Button } from "@/components/ui/button"
 import {
   Tooltip,
   TooltipContent,
+  TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip"
 
 export function TooltipDemo() {
   return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <Button variant="outline" className="w-10 rounded-full p-0">
-          <Plus className="h-4 w-4" />
-          <span className="sr-only">Add</span>
-        </Button>
-      </TooltipTrigger>
-      <TooltipContent>
-        <p>Add to library</p>
-      </TooltipContent>
-    </Tooltip>
+    <TooltipProvider>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button variant="outline" className="w-10 rounded-full p-0">
+            <Plus className="h-4 w-4" />
+            <span className="sr-only">Add</span>
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent>
+          <p>Add to library</p>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
   )
 }
diff --git a/apps/www/components/ui/tooltip.tsx b/apps/www/components/ui/tooltip.tsx
index 4fa6a16a2..56c2573da 100644
--- a/apps/www/components/ui/tooltip.tsx
+++ b/apps/www/components/ui/tooltip.tsx
@@ -5,11 +5,9 @@ import * as TooltipPrimitive from "@radix-ui/react-tooltip"
 
 import { cn } from "@/lib/utils"
 
-const Tooltip = ({ ...props }) => (
-  <TooltipPrimitive.Provider>
-    <TooltipPrimitive.Root {...props} />
-  </TooltipPrimitive.Provider>
-)
+const TooltipProvider = TooltipPrimitive.Provider
+
+const Tooltip = ({ ...props }) => <TooltipPrimitive.Root {...props} />
 Tooltip.displayName = TooltipPrimitive.Tooltip.displayName
 
 const TooltipTrigger = TooltipPrimitive.Trigger
@@ -30,4 +28,4 @@ const TooltipContent = React.forwardRef<
 ))
 TooltipContent.displayName = TooltipPrimitive.Content.displayName
 
-export { Tooltip, TooltipTrigger, TooltipContent }
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
diff --git a/apps/www/content/docs/primitives/tooltip.mdx b/apps/www/content/docs/primitives/tooltip.mdx
index c44aef6d7..ba567bccc 100644
--- a/apps/www/content/docs/primitives/tooltip.mdx
+++ b/apps/www/content/docs/primitives/tooltip.mdx
@@ -34,15 +34,18 @@ This is the `<Tooltip />` primitive. You can place it in a file at `components/u
 import {
   Tooltip,
   TooltipContent,
+  TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip"
 ```
 
 ```tsx
-<Tooltip>
-  <TooltipTrigger>Hover</TooltipTrigger>
-  <TooltipContent>
-    <p>Add to library</p>
-  </TooltipContent>
-</Tooltip>
+<TooltipProvider>
+  <Tooltip>
+    <TooltipTrigger>Hover</TooltipTrigger>
+    <TooltipContent>
+      <p>Add to library</p>
+    </TooltipContent>
+  </Tooltip>
+</TooltipProvider>
 ```