diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 30e636a4..4b22f3ec 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -374,7 +374,9 @@ class _MessageWidgetState extends State<MessageWidget> {
                                                   elevation: 0.0,
                                                   shape: widget.shape ??
                                                       RoundedRectangleBorder(
-                                                        side: isOnlyEmoji
+                                                        side: isOnlyEmoji &&
+                                                                !(showThreadReplyIndicator ||
+                                                                    showInChannel)
                                                             ? BorderSide.none
                                                             : widget.borderSide ??
                                                                 BorderSide(