diff --git a/src/topics/events.js b/src/topics/events.js
index 10ab9b8936..0748318c37 100644
--- a/src/topics/events.js
+++ b/src/topics/events.js
@@ -1,5 +1,6 @@
'use strict';
+const validator = require('validator');
const _ = require('lodash');
const nconf = require('nconf');
const db = require('../database');
@@ -107,7 +108,13 @@ function renderUser(event) {
if (!event.user || event.user.system) {
return '[[global:system-user]]';
}
- return `${helpers.buildAvatar(event.user, '16px', true)} ${event.user.displayname}`;
+
+ const user = {
+ ...event.user,
+ displayname: validator.escape(String(event.user.displayname)),
+ };
+
+ return `${helpers.buildAvatar(user, '16px', true)} ${user.displayname}`;
}
function renderTimeago(event) {