diff --git a/src/OverlayTrigger.tsx b/src/OverlayTrigger.tsx
index 7d4edd7cf4..3a07482d1b 100644
--- a/src/OverlayTrigger.tsx
+++ b/src/OverlayTrigger.tsx
@@ -201,7 +201,7 @@ function OverlayTrigger({
       ? React.Children.only(children).props
       : ({} as any);
 
-  const attachRef = (r: React.ComponentClass | Element | null | undefined) => {
+  const attachRef = (r: React.Component | Element | null | undefined) => {
     mergedRef(safeFindDOMNode(r));
   };
 
diff --git a/src/TransitionWrapper.tsx b/src/TransitionWrapper.tsx
index 25facddd10..33aaef6269 100644
--- a/src/TransitionWrapper.tsx
+++ b/src/TransitionWrapper.tsx
@@ -39,9 +39,7 @@ const TransitionWrapper = React.forwardRef<
     const nodeRef = useRef<HTMLElement>(null);
     const mergedRef = useMergedRefs(nodeRef, childRef);
 
-    const attachRef = (
-      r: React.ComponentClass | Element | null | undefined,
-    ) => {
+    const attachRef = (r: React.Component | Element | null | undefined) => {
       mergedRef(safeFindDOMNode(r));
     };
 
diff --git a/src/safeFindDOMNode.ts b/src/safeFindDOMNode.ts
index 4a011f8c32..567c877a45 100644
--- a/src/safeFindDOMNode.ts
+++ b/src/safeFindDOMNode.ts
@@ -1,7 +1,7 @@
 import ReactDOM from 'react-dom';
 
 export default function safeFindDOMNode(
-  componentOrElement: React.ComponentClass | Element | null | undefined,
+  componentOrElement: React.Component | Element | null | undefined,
 ) {
   if (componentOrElement && 'setState' in componentOrElement) {
     return ReactDOM.findDOMNode(componentOrElement);