diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 729ff7890..d5468d85c 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -255,15 +255,20 @@ class HtmlMessage extends StatelessWidget {
       ]);
     }
 
-    for (int i = 0; i < result.length; i++) {
-      final tag = result[i];
-      if (blockHtmlTags.contains(tag.htmlTagName) ||
-          fullLineHtmlTag.contains(tag.htmlTagName)) {
-        result[i] = ", ";
-      }
-    }
-
     if (pangeaMessageEvent?.textDirection == TextDirection.rtl) {
+      for (int i = 0; i < result.length; i++) {
+        final tag = result[i];
+        if (blockHtmlTags.contains(tag.htmlTagName) ||
+            fullLineHtmlTag.contains(tag.htmlTagName)) {
+          if (i > 0 && result[i - 1] == ", ") {
+            result[i - 1] = "";
+          }
+          result[i] = ", ";
+        }
+      }
+      result.removeWhere((element) => element == "");
+      if (result[0] == ", ") result[0] = "";
+      if (result.last == ", ") result.last = "";
       final inverted = _invertTags(result);
       return inverted.join().trim();
     }