diff --git a/src/stores/room-list/filters/NameFilterCondition.ts b/src/stores/room-list/filters/NameFilterCondition.ts
index 8e63c23131..2a652a091f 100644
--- a/src/stores/room-list/filters/NameFilterCondition.ts
+++ b/src/stores/room-list/filters/NameFilterCondition.ts
@@ -17,7 +17,7 @@ limitations under the License.
 import { Room } from "matrix-js-sdk/src/models/room";
 import { FILTER_CHANGED, FilterKind, IFilterCondition } from "./IFilterCondition";
 import { EventEmitter } from "events";
-import { removeHiddenChars } from "matrix-js-sdk/src/utils";
+import { normalize } from "matrix-js-sdk/src/utils";
 import { throttle } from "lodash";
 
 /**
@@ -65,17 +65,7 @@ export class NameFilterCondition extends EventEmitter implements IFilterConditio
         return this.matches(room.name);
     }
 
-    private normalize(val: string): string {
-        // Note: we have to match the filter with the removeHiddenChars() room name because the
-        // function strips spaces and other characters (M becomes RN for example, in lowercase).
-        return removeHiddenChars(val.toLowerCase())
-            // Strip all punctuation
-            .replace(/[\\'!"#$%&()*+,\-./:;<=>?@[\]^_`{|}~\u2000-\u206f\u2e00-\u2e7f]/g, "")
-            // We also doubly convert to lowercase to work around oddities of the library.
-            .toLowerCase();
-    }
-
-    public matches(val: string): boolean {
-        return this.normalize(val).includes(this.normalize(this.search));
+    public matches(normalizedName: string): boolean {
+        return normalizedName.includes(normalize(this.search));
     }
 }