diff --git a/src/renderer/components/tooltip/tooltip.test.tsx b/src/renderer/components/tooltip/tooltip.test.tsx
index 0f51e5b2f1..3de05c11cb 100644
--- a/src/renderer/components/tooltip/tooltip.test.tsx
+++ b/src/renderer/components/tooltip/tooltip.test.tsx
@@ -3,13 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { render } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import assert from "assert";
 import React from "react";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import type { DiRender } from "../test-utils/renderFor";
+import { renderFor } from "../test-utils/renderFor";
 import { Tooltip } from "./tooltip";
 
 describe("<Tooltip />", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   it("does not render to DOM if not visibile", () => {
     const result = render((
       <>
diff --git a/src/renderer/components/tooltip/tooltip.tsx b/src/renderer/components/tooltip/tooltip.tsx
index 12be968f70..56d0e9839f 100644
--- a/src/renderer/components/tooltip/tooltip.tsx
+++ b/src/renderer/components/tooltip/tooltip.tsx
@@ -226,7 +226,7 @@ class NonInjectedTooltip extends React.Component<TooltipProps & Dependencies> {
     }
 
     const className = cssNames("Tooltip", this.props.className, formatters, this.activePosition, {
-      visible: this.isContentVisible || this.props.visible,
+      visible: this.isContentVisible || visible,
       formatter: !!formatters,
     });
     const tooltip = (