diff --git a/src/components/common/SafeLink.tsx b/src/components/common/SafeLink.tsx
index a31dcd21c..33d6a24b8 100644
--- a/src/components/common/SafeLink.tsx
+++ b/src/components/common/SafeLink.tsx
@@ -20,6 +20,8 @@ type OwnProps = {
   chatId?: string;
   messageId?: number;
   threadId?: ThreadId;
+  entityType?: ApiMessageEntityTypes.Url | ApiMessageEntityTypes.TextUrl |
+    `${ApiMessageEntityTypes.TextUrl}` | `${ApiMessageEntityTypes.Url}`;
 };
 
 const SafeLink = ({
@@ -32,6 +34,7 @@ const SafeLink = ({
   chatId,
   messageId,
   threadId,
+  entityType = ApiMessageEntityTypes.Url,
 }: OwnProps) => {
   const { openUrl } = getActions();
 
@@ -73,7 +76,7 @@ const SafeLink = ({
       className={classNames}
       onClick={handleClick}
       dir={isRtl ? 'rtl' : 'auto'}
-      data-entity-type={ApiMessageEntityTypes.Url}
+      data-entity-type={entityType}
     >
       {content}
     </a>
diff --git a/src/components/common/helpers/renderTextWithEntities.tsx b/src/components/common/helpers/renderTextWithEntities.tsx
index 037691c3e..177f92c3f 100644
--- a/src/components/common/helpers/renderTextWithEntities.tsx
+++ b/src/components/common/helpers/renderTextWithEntities.tsx
@@ -619,6 +619,7 @@ function processEntity({
           chatId={chatId}
           messageId={messageId}
           threadId={threadId}
+          entityType={entity.type}
         >
           {renderNestedMessagePart()}
         </SafeLink>