1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 3f6ec4a7b..24098516e 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -24,7 +24,9 @@ module.exports = React.createClass({
         var self = this;
         var icon;
         var timestamp = UserStore.getCurrentUser().update_at;
-        if (this.props.id != null) {
+        if (this.props.id === "allmention" || this.props.id === "channelmention") {
+            icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
+        } else if (this.props.id != null) {
             icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image?time=" + timestamp}/></span>;
         } else {
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;