diff --git a/frontend/.storybook/preview.tsx b/frontend/.storybook/preview.tsx
index c32cf8dbc..3982bf57b 100644
--- a/frontend/.storybook/preview.tsx
+++ b/frontend/.storybook/preview.tsx
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { ArgTypes, Decorator, Parameters, Preview } from "@storybook/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { useLayoutEffect } from "react";
 
 import "../src/main.css";
@@ -71,9 +70,7 @@ const withThemeProvider: Decorator = (Story, context) => {
   return (
     <>
       <ThemeSwitcher theme={context.globals.theme} />
-      <TooltipProvider>
-        <Story />
-      </TooltipProvider>
+      <Story />
     </>
   );
 };
diff --git a/frontend/src/components/CompatSession.test.tsx b/frontend/src/components/CompatSession.test.tsx
index f9d8cc0e7..76b6465d3 100644
--- a/frontend/src/components/CompatSession.test.tsx
+++ b/frontend/src/components/CompatSession.test.tsx
@@ -14,7 +14,6 @@
 
 // @vitest-environment happy-dom
 
-import { TooltipProvider } from "@vector-im/compound-web";
 import { create } from "react-test-renderer";
 import { Provider } from "urql";
 import { describe, expect, it, beforeAll } from "vitest";
@@ -49,13 +48,11 @@ describe("<CompatSession />", () => {
   it("renders an active session", () => {
     const session = makeFragmentData(baseSession, FRAGMENT);
     const component = create(
-      <TooltipProvider>
-        <Provider value={mockClient}>
-          <DummyRouter>
-            <CompatSession session={session} />
-          </DummyRouter>
-        </Provider>
-      </TooltipProvider>,
+      <Provider value={mockClient}>
+        <DummyRouter>
+          <CompatSession session={session} />
+        </DummyRouter>
+      </Provider>,
     );
     expect(component.toJSON()).toMatchSnapshot();
   });
@@ -69,13 +66,11 @@ describe("<CompatSession />", () => {
       FRAGMENT,
     );
     const component = create(
-      <TooltipProvider>
-        <Provider value={mockClient}>
-          <DummyRouter>
-            <CompatSession session={session} />
-          </DummyRouter>
-        </Provider>
-      </TooltipProvider>,
+      <Provider value={mockClient}>
+        <DummyRouter>
+          <CompatSession session={session} />
+        </DummyRouter>
+      </Provider>,
     );
     expect(component.toJSON()).toMatchSnapshot();
   });
diff --git a/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx b/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx
index 4dfcf8261..99d6c1e8b 100644
--- a/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx
+++ b/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx
@@ -15,7 +15,6 @@
 // @vitest-environment happy-dom
 
 import { render, cleanup } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { Provider } from "urql";
 import { describe, expect, it, afterEach, beforeAll } from "vitest";
 import { never } from "wonka";
@@ -52,13 +51,11 @@ describe("<CompatSessionDetail>", () => {
     const data = makeFragmentData({ ...baseSession }, FRAGMENT);
 
     const { container, getByText, queryByText } = render(
-      <TooltipProvider>
-        <Provider value={mockClient}>
-          <DummyRouter>
-            <CompatSessionDetail session={data} />
-          </DummyRouter>
-        </Provider>
-      </TooltipProvider>,
+      <Provider value={mockClient}>
+        <DummyRouter>
+          <CompatSessionDetail session={data} />
+        </DummyRouter>
+      </Provider>,
     );
 
     expect(container).toMatchSnapshot();
diff --git a/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx b/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx
index bde1e78ba..65884cf1c 100644
--- a/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx
+++ b/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx
@@ -15,7 +15,6 @@
 // @vitest-environment happy-dom
 
 import { render, cleanup } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { Provider } from "urql";
 import { describe, expect, it, afterEach, beforeAll } from "vitest";
 import { never } from "wonka";
@@ -56,13 +55,11 @@ describe("<OAuth2SessionDetail>", () => {
     const data = makeFragmentData(baseSession, FRAGMENT);
 
     const { asFragment, getByText, queryByText } = render(
-      <TooltipProvider>
-        <Provider value={mockClient}>
-          <DummyRouter>
-            <OAuth2SessionDetail session={data} />
-          </DummyRouter>
-        </Provider>
-      </TooltipProvider>,
+      <Provider value={mockClient}>
+        <DummyRouter>
+          <OAuth2SessionDetail session={data} />
+        </DummyRouter>
+      </Provider>,
     );
 
     expect(asFragment()).toMatchSnapshot();
@@ -80,13 +77,11 @@ describe("<OAuth2SessionDetail>", () => {
     );
 
     const { asFragment, getByText, queryByText } = render(
-      <TooltipProvider>
-        <Provider value={mockClient}>
-          <DummyRouter>
-            <OAuth2SessionDetail session={data} />
-          </DummyRouter>
-        </Provider>
-      </TooltipProvider>,
+      <Provider value={mockClient}>
+        <DummyRouter>
+          <OAuth2SessionDetail session={data} />
+        </DummyRouter>
+      </Provider>,
     );
 
     expect(asFragment()).toMatchSnapshot();
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 528481ebe..bae5b52dc 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { RouterProvider, createRouter } from "@tanstack/react-router";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { Suspense, StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { I18nextProvider } from "react-i18next";
@@ -50,9 +49,7 @@ createRoot(document.getElementById("root") as HTMLElement).render(
       <ErrorBoundary>
         <Suspense fallback={<LoadingScreen />}>
           <I18nextProvider i18n={i18n}>
-            <TooltipProvider>
-              <RouterProvider router={router} context={{ client }} />
-            </TooltipProvider>
+            <RouterProvider router={router} context={{ client }} />
           </I18nextProvider>
         </Suspense>
       </ErrorBoundary>