diff --git a/src/components/views/elements/InfoTooltip.tsx b/src/components/views/elements/InfoTooltip.tsx
index a323ce035d..f77a07bd21 100644
--- a/src/components/views/elements/InfoTooltip.tsx
+++ b/src/components/views/elements/InfoTooltip.tsx
@@ -21,7 +21,7 @@ import classNames from 'classnames';
 import { Alignment } from './Tooltip';
 import { _t } from "../../../languageHandler";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { TooltipTarget } from './TooltipTarget';
+import TooltipTarget from './TooltipTarget';
 
 export enum InfoTooltipKind {
     Info = "info",
diff --git a/src/components/views/elements/TextWithTooltip.tsx b/src/components/views/elements/TextWithTooltip.tsx
index 121da9349b..79ddabcc90 100644
--- a/src/components/views/elements/TextWithTooltip.tsx
+++ b/src/components/views/elements/TextWithTooltip.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { TooltipTarget } from './TooltipTarget';
+import TooltipTarget from './TooltipTarget';
 
 interface IProps {
     class?: string;
diff --git a/src/components/views/elements/TooltipButton.tsx b/src/components/views/elements/TooltipButton.tsx
index 5247769516..6989423258 100644
--- a/src/components/views/elements/TooltipButton.tsx
+++ b/src/components/views/elements/TooltipButton.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { TooltipTarget } from './TooltipTarget';
+import TooltipTarget from './TooltipTarget';
 
 interface IProps {
     helpText: React.ReactNode | string;
diff --git a/src/components/views/elements/TooltipTarget.tsx b/src/components/views/elements/TooltipTarget.tsx
index 88ce02b92c..d7f18fba51 100644
--- a/src/components/views/elements/TooltipTarget.tsx
+++ b/src/components/views/elements/TooltipTarget.tsx
@@ -25,7 +25,7 @@ interface IProps extends HTMLAttributes<HTMLSpanElement>, Omit<ITooltipProps, 'v
  * Generic tooltip target element that handles tooltip visibility state
  * and displays children
  */
-export const TooltipTarget: React.FC<IProps> = ({
+const TooltipTarget: React.FC<IProps> = ({
     children,
     tooltipTargetClassName,
     // tooltip pass through props
@@ -66,3 +66,5 @@ export const TooltipTarget: React.FC<IProps> = ({
         </div>
     );
 };
+
+export default TooltipTarget;
diff --git a/test/components/views/elements/TooltipTarget-test.tsx b/test/components/views/elements/TooltipTarget-test.tsx
index fe318e38ec..f81445994d 100644
--- a/test/components/views/elements/TooltipTarget-test.tsx
+++ b/test/components/views/elements/TooltipTarget-test.tsx
@@ -8,7 +8,7 @@ import {
 import { act } from "react-dom/test-utils";
 
 import { Alignment } from '../../../../src/components/views/elements/Tooltip';
-import { TooltipTarget } from "../../../../src/components/views/elements/TooltipTarget";
+import TooltipTarget from "../../../../src/components/views/elements/TooltipTarget";
 
 describe('<TooltipTarget />', () => {
     const defaultProps = {