diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index 4d35904976..2aedf8d7f5 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -95,7 +95,11 @@ export default class AutocompleteWrapperModel {
         const firstChr = completionId && completionId[0];
         switch (firstChr) {
             case "@": {
-                return this._partCreator.userPill(text, completionId);
+                if (completionId === "@room") {
+                    return this._partCreator.atRoomPill(completionId);
+                } else {
+                    return this._partCreator.userPill(text, completionId);
+                }
             }
             case "#":
                 return this._partCreator.roomPill(completionId);