diff --git a/webapp/channels/src/components/admin_console/list_table/elapsed_duration_cell.tsx b/webapp/channels/src/components/admin_console/list_table/elapsed_duration_cell.tsx
index a216cc5a21..a3e2ecca3e 100644
--- a/webapp/channels/src/components/admin_console/list_table/elapsed_duration_cell.tsx
+++ b/webapp/channels/src/components/admin_console/list_table/elapsed_duration_cell.tsx
@@ -5,10 +5,7 @@ import moment from 'moment';
 import React, {useMemo} from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 
-import OverlayTrigger from 'components/overlay_trigger';
-import Tooltip from 'components/tooltip';
-
-import Constants from 'utils/constants';
+import WithTooltip from 'components/with_tooltip';
 
 interface Props {
     date?: number;
@@ -67,16 +64,12 @@ export function ElapsedDurationCell(props: Props) {
     }
 
     return (
-        <OverlayTrigger
-            delayShow={Constants.OVERLAY_TIME_DELAY}
+        <WithTooltip
+            id='system-users-cell-elapsed-duration-tooltip'
             placement='bottom'
-            overlay={
-                <Tooltip id='system-users-cell-elapsed-duration-tooltip'>
-                    {exactPassedInDate}
-                </Tooltip>
-            }
+            title={exactPassedInDate}
         >
             <span>{elapsedDaysText}</span>
-        </OverlayTrigger>
+        </WithTooltip>
     );
 }