diff --git a/src/api/gramjs/methods/messages.ts b/src/api/gramjs/methods/messages.ts
index 4295b4d6d..e02027e36 100644
--- a/src/api/gramjs/methods/messages.ts
+++ b/src/api/gramjs/methods/messages.ts
@@ -1140,9 +1140,15 @@ export async function searchMessagesGlobal({
   };
 }
 
-export async function fetchWebPagePreview({ message }: { message: string }) {
+export async function fetchWebPagePreview({
+  text,
+}: {
+  text: ApiFormattedText;
+}) {
+  const textWithEntities = buildInputTextWithEntities(text);
   const preview = await invokeRequest(new GramJs.messages.GetWebPagePreview({
-    message,
+    message: textWithEntities.text,
+    entities: textWithEntities.entities,
   }));
 
   return preview && buildWebPage(preview);
diff --git a/src/components/middle/composer/WebPagePreview.tsx b/src/components/middle/composer/WebPagePreview.tsx
index 0cefda73f..bf8018a76 100644
--- a/src/components/middle/composer/WebPagePreview.tsx
+++ b/src/components/middle/composer/WebPagePreview.tsx
@@ -1,11 +1,15 @@
-import type { Signal } from '../../../util/signals';
-import type { FC } from '../../../lib/teact/teact';
-import React, { memo, useCallback, useEffect } from '../../../lib/teact/teact';
+import React, {
+  memo, useCallback, useEffect, useRef,
+} from '../../../lib/teact/teact';
 import { getActions, withGlobal } from '../../../global';
 
-import type { ApiMessage, ApiMessageEntityTextUrl, ApiWebPage } from '../../../api/types';
+import type { FC } from '../../../lib/teact/teact';
+import type {
+  ApiFormattedText, ApiMessage, ApiMessageEntityTextUrl, ApiWebPage,
+} from '../../../api/types';
 import { ApiMessageEntityTypes } from '../../../api/types';
 import type { ISettings } from '../../../types';
+import type { Signal } from '../../../util/signals';
 
 import { RE_LINK_TEMPLATE } from '../../../config';
 import { selectTabState, selectNoWebPage, selectTheme } from '../../../global/selectors';
@@ -54,27 +58,32 @@ const WebPagePreview: FC<OwnProps & StateProps> = ({
     toggleMessageWebPage,
   } = getActions();
 
+  const formattedTextWithLinkRef = useRef<ApiFormattedText>();
+
   const detectLinkDebounced = useDebouncedResolver(() => {
-    const { text, entities } = parseMessageInput(getHtml());
-    const linkEntity = entities?.find((entity): entity is ApiMessageEntityTextUrl => (
+    const formattedText = parseMessageInput(getHtml());
+    const linkEntity = formattedText.entities?.find((entity): entity is ApiMessageEntityTextUrl => (
       entity.type === ApiMessageEntityTypes.TextUrl
     ));
 
-    return linkEntity?.url || text.match(RE_LINK)?.[0];
+    formattedTextWithLinkRef.current = formattedText;
+
+    return linkEntity?.url || formattedText.text.match(RE_LINK)?.[0];
   }, [getHtml], DEBOUNCE_MS, true);
 
   const getLink = useDerivedSignal(detectLinkDebounced, [detectLinkDebounced, getHtml], true);
 
   useEffect(() => {
     const link = getLink();
+    const formattedText = formattedTextWithLinkRef.current;
 
     if (link) {
-      loadWebPagePreview({ text: link });
+      loadWebPagePreview({ text: formattedText! });
     } else {
       clearWebPagePreview();
       toggleMessageWebPage({ chatId, threadId });
     }
-  }, [getLink, chatId, threadId, clearWebPagePreview, loadWebPagePreview, toggleMessageWebPage]);
+  }, [getLink, chatId, threadId]);
 
   useSyncEffect(() => {
     clearWebPagePreview();
diff --git a/src/global/actions/api/messages.ts b/src/global/actions/api/messages.ts
index 269323500..f63fe8cf4 100644
--- a/src/global/actions/api/messages.ts
+++ b/src/global/actions/api/messages.ts
@@ -664,7 +664,7 @@ addActionHandler('markMessagesRead', (global, actions, payload): ActionReturnTyp
 addActionHandler('loadWebPagePreview', async (global, actions, payload): Promise<void> => {
   const { text, tabId = getCurrentTabId() } = payload;
 
-  const webPagePreview = await callApi('fetchWebPagePreview', { message: text });
+  const webPagePreview = await callApi('fetchWebPagePreview', { text });
 
   global = getGlobal();
   global = updateTabState(global, {
diff --git a/src/global/types.ts b/src/global/types.ts
index ffdffe789..36171c976 100644
--- a/src/global/types.ts
+++ b/src/global/types.ts
@@ -1022,7 +1022,7 @@ export interface ActionPayloads {
 
   // misc
   loadWebPagePreview: {
-    text: string;
+    text: ApiFormattedText;
   } & WithTabId;
   clearWebPagePreview: WithTabId | undefined;
   loadWallpapers: undefined;