diff --git a/src/components/common/SafeLink.tsx b/src/components/common/SafeLink.tsx
index 0b17f8327..412db2561 100644
--- a/src/components/common/SafeLink.tsx
+++ b/src/components/common/SafeLink.tsx
@@ -18,6 +18,7 @@ type OwnProps = {
   text: string;
   className?: string;
   children?: TeactNode;
+  withNormalWordBreak?: boolean;
   isRtl?: boolean;
 };
 
@@ -26,6 +27,7 @@ const SafeLink = ({
   text,
   className,
   children,
+  withNormalWordBreak,
   isRtl,
 }: OwnProps) => {
   const { openUrl } = getActions();
@@ -48,7 +50,7 @@ const SafeLink = ({
 
   const classNames = buildClassName(
     className || 'text-entity-link',
-    text.length > 50 && 'long-word-break-all',
+    !withNormalWordBreak && 'word-break-all',
   );
 
   return (
diff --git a/src/components/common/helpers/renderTextWithEntities.tsx b/src/components/common/helpers/renderTextWithEntities.tsx
index 6d2632eb0..710edf664 100644
--- a/src/components/common/helpers/renderTextWithEntities.tsx
+++ b/src/components/common/helpers/renderTextWithEntities.tsx
@@ -555,6 +555,7 @@ function processEntity({
         <SafeLink
           url={getLinkUrl(entityText, entity)}
           text={entityText}
+          withNormalWordBreak
         >
           {renderNestedMessagePart()}
         </SafeLink>
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index 81771b743..a69ee0c88 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -940,7 +940,7 @@
   }
 }
 
-.long-word-break-all {
+.word-break-all {
   word-break: break-all;
 }