diff --git a/src/components/Message/MessageStatus.tsx b/src/components/Message/MessageStatus.tsx
index afa096c70..72af6cfd4 100644
--- a/src/components/Message/MessageStatus.tsx
+++ b/src/components/Message/MessageStatus.tsx
@@ -88,10 +88,10 @@ const UnMemoizedMessageStatus = <
>
{sending &&
(MessageSendingStatus ? (
-
+
) : (
- <>
-
+ ('Sending...')}
- >
+ >
))}
{delivered &&
@@ -109,13 +109,13 @@ const UnMemoizedMessageStatus = <
) : (
<>
- {t('Delivered')}
-
-
+ offset={[0, 5]}
+ referenceElement={referenceElement}
+ visible={tooltipVisible}
+ >
+ {t('Delivered')}
+
+
>
))}
@@ -125,12 +125,12 @@ const UnMemoizedMessageStatus = <
) : (
<>
- {getReadByTooltipText(readBy, t, client, tooltipUserNameMapper)}
-
+ offset={[0, 5]}
+ referenceElement={referenceElement}
+ visible={tooltipVisible}
+ >
+ {getReadByTooltipText(readBy, t, client, tooltipUserNameMapper)}
+