diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index e4cc9567a0..a72cc3fce2 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -45,7 +45,7 @@ export default class RoomProvider extends AutocompleteProvider {
     constructor() {
         super(ROOM_REGEX);
         this.matcher = new FuzzyMatcher([], {
-            keys: ['displayedAlias', 'name'],
+            keys: ['displayedAlias', '_name'],
         });
     }
 
@@ -69,6 +69,7 @@ export default class RoomProvider extends AutocompleteProvider {
                 return {
                     room: room,
                     name: room.name,
+                    _name: stripDiacritics(room.name),
                     displayedAlias: getDisplayAliasForRoom(room),
                 };
             }));
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index c98304fff8..42fcb5899b 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -40,11 +40,11 @@ export default class UserProvider extends AutocompleteProvider {
 
     constructor(room: Room) {
         super(USER_REGEX, {
-            keys: ['name'],
+            keys: ['_name'],
         });
         this.room = room;
         this.matcher = new FuzzyMatcher([], {
-            keys: ['name', 'userId'],
+            keys: ['_name', 'userId'],
             shouldMatchPrefix: true,
             shouldMatchWordsOnly: false,
         });
@@ -149,7 +149,8 @@ export default class UserProvider extends AutocompleteProvider {
             if (userId === currentUserId) return; // skip self
             this.users.push({
                 userId,
-                name: stripDiacritics(name),
+                name,
+                _name: stripDiacritics(name),
                 ...rest,
             });
         });