diff --git a/webapp/channels/src/components/custom_status/custom_status_text.tsx b/webapp/channels/src/components/custom_status/custom_status_text.tsx
index 4be47f20201..52ccdf7260c 100644
--- a/webapp/channels/src/components/custom_status/custom_status_text.tsx
+++ b/webapp/channels/src/components/custom_status/custom_status_text.tsx
@@ -6,10 +6,7 @@ import {useSelector} from 'react-redux';
 
 import {isCustomStatusEnabled} from 'selectors/views/custom_status';
 
-import OverlayTrigger from 'components/overlay_trigger';
-import Tooltip from 'components/tooltip';
-
-import Constants from 'utils/constants';
+import WithTooltip from 'components/with_tooltip';
 
 import type {GlobalState} from 'types/store';
 
@@ -51,17 +48,13 @@ const CustomStatusText = (props: ComponentProps) => {
     }
 
     return (
-        <OverlayTrigger
-            delayShow={Constants.OVERLAY_TIME_DELAY}
+        <WithTooltip
+            id='custom-status-tooltip'
             placement={tooltipDirection}
-            overlay={
-                <Tooltip id='custom-status-tooltip'>
-                    {text}
-                </Tooltip>
-            }
+            title={text}
         >
             {customStatusTextComponent}
-        </OverlayTrigger>
+        </WithTooltip>
     );
 };