diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
index 2729f5e776..3b0e9a236a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
@@ -53,7 +53,11 @@ class SuggestionsProcessor @Inject constructor() {
             }
             SuggestionType.Room -> {
                 roomAliasSuggestions
-                    .filter { it.roomAlias.value.contains(suggestion.text, ignoreCase = true) }
+                    .filter { roomAliasSuggestion ->
+                        // Filter by either room alias or room name (if available)
+                        roomAliasSuggestion.roomAlias.value.contains(suggestion.text, ignoreCase = true) ||
+                            roomAliasSuggestion.roomName?.contains(suggestion.text, ignoreCase = true) == true
+                    }
                     .map {
                         ResolvedSuggestion.Alias(
                             roomAlias = it.roomAlias,