diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
index d6c3f718d8..df86749a15 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
@@ -65,6 +65,11 @@ class MatrixRoom(
             return slidingSyncRoom.name()
         }
 
+    val bestName: String
+        get() {
+            return name?.takeIf { it.isNotEmpty() } ?: room.id()
+        }
+
     val displayName: String
         get() {
             return room.displayName()
diff --git a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/MatrixItemHelper.kt b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/MatrixItemHelper.kt
index fb8a25f7f7..a040e18585 100644
--- a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/MatrixItemHelper.kt
+++ b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/MatrixItemHelper.kt
@@ -55,7 +55,7 @@ class MatrixItemHelper(
 
     suspend fun loadAvatarData(room: MatrixRoom, size: AvatarSize): AvatarData {
         return loadAvatarData(
-            name = room.name ?: room.roomId.value,
+            name = room.bestName,
             url = room.avatarUrl,
             size = size
         )
diff --git a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaFetcher.kt b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaFetcher.kt
index 796f699852..d345f26984 100644
--- a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaFetcher.kt
+++ b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaFetcher.kt
@@ -24,7 +24,7 @@ import io.element.android.x.matrix.MatrixClient
 import io.element.android.x.matrix.media.MediaResolver
 import java.nio.ByteBuffer
 
-class MediaFetcher(
+internal class MediaFetcher(
     private val mediaResolver: MediaResolver?,
     private val meta: MediaResolver.Meta,
     private val options: Options,
diff --git a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaKeyer.kt b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaKeyer.kt
index acebdf82ee..0831f6815e 100644
--- a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaKeyer.kt
+++ b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaKeyer.kt
@@ -20,7 +20,7 @@ import coil.key.Keyer
 import coil.request.Options
 import io.element.android.x.matrix.media.MediaResolver
 
-class MediaKeyer : Keyer<MediaResolver.Meta> {
+internal class MediaKeyer : Keyer<MediaResolver.Meta> {
     override fun key(data: MediaResolver.Meta, options: Options): String? {
         return "${data.source.url()}_${data.kind}"
     }