diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index a8e2f65fa..1b3344ec8 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -621,7 +621,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
   function renderSenderName() {
     const shouldRender = !(customShape && !viaBotId) && (
       (withSenderName && !photo && !video) || asForwarded || viaBotId || forceSenderName
-    ) && (!isInDocumentGroup || isFirstInDocumentGroup);
+    ) && (!isInDocumentGroup || isFirstInDocumentGroup) && !(hasReply && customShape);
 
     if (!shouldRender) {
       return undefined;