diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 68e4e29337..34c1fd4c32 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -237,7 +237,15 @@ const Pill = createReactClass({
             case Pill.TYPE_ROOM_MENTION: {
                 const room = this.state.room;
                 if (room) {
-                    linkText = (room ? getDisplayAliasForRoom(room) : null) || resource;
+                    const isModeratedAlias = room.getCanonicalAlias() === resource ||
+                        room.getAltAliases().includes(resource);
+                    if (!isModeratedAlias) {
+                        linkText = getDisplayAliasForRoom(room);
+                    }
+                    // if there are no moderated aliases, stick to resource
+                    if (!linkText) {
+                        linkText = resource;
+                    }
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }