diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index f708ab7770..cb140c61a4 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -111,7 +111,7 @@ export function pillifyLinks(nodes, mxEvent, pills) {
                             type={Pill.TYPE_AT_ROOM_MENTION}
                             inMessage={true}
                             room={room}
-                            shouldShowPillAvatar={true}
+                            shouldShowPillAvatar={shouldShowPillAvatar}
                         />;
 
                         ReactDOM.render(pill, pillContainer);