diff --git a/src/components/middle/message/Message.scss b/src/components/middle/message/Message.scss
index 55cf67204..c7063b45d 100644
--- a/src/components/middle/message/Message.scss
+++ b/src/components/middle/message/Message.scss
@@ -661,10 +661,6 @@
 
 .media-inner {
   overflow: hidden;
-
-  &.small-image img {
-    border-radius: 0 !important;
-  }
 }
 
 .Message .custom-shape .message-action-button {
diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 062e51536..babb346ae 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -607,7 +607,7 @@ const Message: FC<OwnProps & StateProps> = ({
 
     if (width) {
       calculatedWidth = Math.max(getMinMediaWidth(Boolean(text), withCommentButton), width);
-      if (calculatedWidth - width > NO_MEDIA_CORNERS_THRESHOLD) {
+      if (invoice?.extendedMedia && calculatedWidth - width > NO_MEDIA_CORNERS_THRESHOLD) {
         noMediaCorners = true;
       }
     }