diff --git a/src/components/middle/message/CommentButton.scss b/src/components/middle/message/CommentButton.scss
index 6f772d561..c536438fc 100644
--- a/src/components/middle/message/CommentButton.scss
+++ b/src/components/middle/message/CommentButton.scss
@@ -125,7 +125,8 @@
   .voice &,
   .poll &,
   .text &,
-  .giveaway & {
+  .giveaway &,
+  .unsupported & {
     border-top: 1px solid var(--color-borders);
   }
 
@@ -144,7 +145,8 @@
   .message-content.poll &,
   .message-content.giveaway &,
   .message-content.has-solid-background.text &,
-  .message-content.has-solid-background.is-forwarded & {
+  .message-content.has-solid-background.is-forwarded &,
+  .message-content.unsupported & {
     width: calc(100% + 1rem);
   }
 
diff --git a/src/components/middle/message/helpers/buildContentClassName.ts b/src/components/middle/message/helpers/buildContentClassName.ts
index ea50c8621..f49fc644e 100644
--- a/src/components/middle/message/helpers/buildContentClassName.ts
+++ b/src/components/middle/message/helpers/buildContentClassName.ts
@@ -41,11 +41,12 @@ export function buildContentClassName(
   const { paidMedia } = getMessageContent(message);
   const { photo: paidMediaPhoto, video: paidMediaVideo } = getSingularPaidMedia(paidMedia);
 
+  const content = getMessageContent(message);
   const {
     photo = paidMediaPhoto, video = paidMediaVideo,
     audio, voice, document, poll, webPage, contact, location, invoice, storyData,
     giveaway, giveawayResults,
-  } = getMessageContent(message);
+  } = content;
   const text = album?.hasMultipleCaptions ? undefined : getMessageContent(album?.captionMessage || message).text;
   const hasFactCheck = Boolean(message.factCheck?.text);
 
@@ -84,6 +85,10 @@ export function buildContentClassName(
     classNames.push('no-text');
   }
 
+  if (!Object.keys(content).length) {
+    classNames.push('unsupported');
+  }
+
   if (hasActionButton) {
     classNames.push('has-action-button');
   }