diff --git a/src/components/common/CustomEmoji.module.scss b/src/components/common/CustomEmoji.module.scss
index 9de6f2a0e..d4e0ea149 100644
--- a/src/components/common/CustomEmoji.module.scss
+++ b/src/components/common/CustomEmoji.module.scss
@@ -5,8 +5,6 @@
   height: var(--custom-emoji-size);
   position: relative;
 
-  border-radius: 0 !important;
-
   &.with-grid-fix .media, &.with-grid-fix .thumb {
     width: calc(100% + 1px) !important;
     height: calc(100% + 1px) !important;
@@ -27,11 +25,13 @@
   width: var(--custom-emoji-size) !important;
   height: var(--custom-emoji-size) !important;
 
-  border-radius: 0 !important;
-
   user-select: none !important;
 }
 
+.root, .media, .thumb {
+  border-radius: 0 !important;
+}
+
 .highlightCatch {
   position: absolute;
   top: 0;
diff --git a/src/components/middle/message/Message.scss b/src/components/middle/message/Message.scss
index 752af77ac..55cf67204 100644
--- a/src/components/middle/message/Message.scss
+++ b/src/components/middle/message/Message.scss
@@ -647,7 +647,8 @@
 .media-inner,
 .message-content.media .media-inner img,
 .message-content.media .media-inner video,
-.message-content.custom-shape .media-inner img {
+.message-content.custom-shape .media-inner img,
+.message-content.custom-shape .media-inner video {
   border-top-left-radius: var(--border-top-left-radius);
   border-top-right-radius: var(--border-top-right-radius);
   border-bottom-left-radius: var(--border-bottom-left-radius);