diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 3c5f3d4701..4ef38758c7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -203,7 +203,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(
             val newPublicRooms = data.chunk.orEmpty()
                     .filter {
                         showAllRooms
-                                || "${it.name} ${it.topic}".toLowerCase(Locale.ROOT)
+                                || "${it.name.orEmpty()} ${it.topic.orEmpty()} ${it.canonicalAlias.orEmpty()}".toLowerCase(Locale.ROOT)
                                 .let { str ->
                                     explicitContentTerms.all { term -> term !in str }
                                 }