diff --git a/app/chatpal-search/client/template/result.html b/app/chatpal-search/client/template/result.html
index 45877e108e57..c0c410f3e934 100644
--- a/app/chatpal-search/client/template/result.html
+++ b/app/chatpal-search/client/template/result.html
@@ -111,7 +111,7 @@
+ style="background-image:url({{getAvatarUrl username }});">
{{username}}
{{time}}
diff --git a/app/chatpal-search/client/template/result.js b/app/chatpal-search/client/template/result.js
index 751e92897da9..4268444de28c 100644
--- a/app/chatpal-search/client/template/result.js
+++ b/app/chatpal-search/client/template/result.js
@@ -6,8 +6,8 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { DateFormat } from '../../../lib';
import { roomTypes, getURL } from '../../../utils';
import { Subscriptions } from '../../../models';
+import { getUserAvatarURL as getAvatarUrl } from '../../../utils/lib/getUserAvatarURL';
-const getAvatarUrl = (username) => getURL(`/avatar/${ username }?_dc=undefined`);
const getDMUrl = (username) => getURL(`/direct/${ username }`);
Template.ChatpalSearchResultTemplate.onCreated(function() {
@@ -138,7 +138,8 @@ Template.ChatpalSearchSingleRoom.helpers({
Template.ChatpalSearchSingleUser.helpers({
cleanUsername() {
- return this.user_username.replace(/<\/?em>/ig, '');
+ const username = this.user_username || this.username; // varies whether users or messages of users are displayed
+ return username.replace(/<\/?em>/ig, '');
},
getAvatarUrl,
getDMUrl,