diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 5776e202de3..191fa7888d7 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -3,6 +3,7 @@ import { MotionGlobalConfig } from "framer-motion"
 import type { Preview } from "@storybook/react"
 
 import ThemeProvider from "@/components/ThemeProvider"
+import { TooltipProvider } from "@/components/ui/tooltip"
 
 import i18n, { baseLocales } from "./i18next"
 import { withNextThemes } from "./withNextThemes"
@@ -39,7 +40,9 @@ const preview: Preview = {
     }),
     (Story) => (
       <ThemeProvider>
-        <Story />
+        <TooltipProvider>
+          <Story />
+        </TooltipProvider>
       </ThemeProvider>
     ),
   ],
diff --git a/src/components/Glossary/GlossaryTooltip/GlossaryTooltip.stories.tsx b/src/components/Glossary/GlossaryTooltip/GlossaryTooltip.stories.tsx
index e7cd9e1b69d..7fe2ad9ea65 100644
--- a/src/components/Glossary/GlossaryTooltip/GlossaryTooltip.stories.tsx
+++ b/src/components/Glossary/GlossaryTooltip/GlossaryTooltip.stories.tsx
@@ -1,8 +1,6 @@
 import { Center } from "@chakra-ui/react"
 import { Meta, StoryObj } from "@storybook/react"
 
-import { TooltipProvider } from "@/components/ui/tooltip"
-
 import GlossaryTooltipComponent from "."
 
 const meta = {
@@ -15,9 +13,7 @@ const meta = {
   decorators: [
     (Story) => (
       <Center boxSize="md">
-        <TooltipProvider>
-          <Story />
-        </TooltipProvider>
+        <Story />
       </Center>
     ),
   ],
diff --git a/src/components/Tooltip/Tooltip.stories.tsx b/src/components/Tooltip/Tooltip.stories.tsx
index 72e4150a271..66638a9f22f 100644
--- a/src/components/Tooltip/Tooltip.stories.tsx
+++ b/src/components/Tooltip/Tooltip.stories.tsx
@@ -4,7 +4,6 @@ import { Meta, StoryObj } from "@storybook/react"
 
 import InlineLink from "../Link"
 import Translation from "../Translation"
-import { TooltipProvider } from "../ui/tooltip"
 
 // TODO: remove `index` when we delete the old tooltip
 import TooltipComponent from "./index"
@@ -47,9 +46,7 @@ const meta = {
   decorators: [
     (Story) => (
       <Center boxSize="md">
-        <TooltipProvider>
-          <Story />
-        </TooltipProvider>
+        <Story />
       </Center>
     ),
   ],