diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index 9d9159cc7..7e1bd0ba7 100644
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -65,7 +65,7 @@ def message_presentation(message)
       # Only apply auto_link if the message doesn't have markdown
       # (markdown filter already processes links and sanitizes HTML)
       if has_markdown
-        filtered_content.html_safe
+        filtered_content.to_s.html_safe
       else
         auto_link h(filtered_content), html: { target: "_blank" }
       end