diff --git a/src/ui/components/Tooltip.tsx b/src/ui/components/Tooltip.tsx
index 6864561d7..464808272 100644
--- a/src/ui/components/Tooltip.tsx
+++ b/src/ui/components/Tooltip.tsx
@@ -31,11 +31,11 @@ export default class Tooltip extends Component<TooltipProps, TooltipState> {
     TOOLTIP_PROVIDER: PropTypes.object,
   };
 
-  context: {
+  context!: {
     TOOLTIP_PROVIDER: TooltipProvider;
   };
 
-  ref: HTMLDivElement | null;
+  ref: HTMLDivElement | undefined;
 
   state = {
     open: false,
@@ -63,7 +63,7 @@ export default class Tooltip extends Component<TooltipProps, TooltipState> {
     this.setState({open: false});
   };
 
-  setRef = (ref: HTMLDivElement | null) => {
+  setRef = (ref: HTMLDivElement | undefined) => {
     this.ref = ref;
   };
 
diff --git a/src/ui/components/TooltipProvider.tsx b/src/ui/components/TooltipProvider.tsx
index efd41f7e6..8293c15d4 100644
--- a/src/ui/components/TooltipProvider.tsx
+++ b/src/ui/components/TooltipProvider.tsx
@@ -142,7 +142,7 @@ export default class TooltipProvider extends Component<
     TOOLTIP_PROVIDER: PropTypes.object,
   };
 
-  state = {
+  state: TooltipState = {
     tooltip: null,
     timeoutID: undefined,
   };