diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index a3cdbac82..0988e39d8 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -46,7 +46,7 @@ class HtmlMessage extends StatelessWidget {
       final newHtml = parts
           .map(
             (linkifyElement) => linkifyElement is! UrlElement
-                ? linkifyElement.text
+                ? Uri.encodeComponent(linkifyElement.text)
                 : '<a href="${linkifyElement.text}">${linkifyElement.text}</a>',
           )
           .join(' ');