diff --git a/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
index 2edb2c4edf..687c280910 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
@@ -75,6 +75,7 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
     }
 
     @AnyThread
+    @Throws
     fun shortcutDrawable(context: Context, glideRequest: GlideRequests, matrixItem: MatrixItem, iconSize: Int): Bitmap {
         return glideRequest
                 .asBitmap()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
index c3f6e4b074..34f2b7bd76 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
@@ -61,11 +61,14 @@ class ShortcutsHandler @Inject constructor(
                             .take(n = 4) // Android only allows us to create 4 shortcuts
                             .map { room ->
                                 val intent = RoomDetailActivity.shortcutIntent(context, room.roomId)
-                                val bitmap = avatarRenderer.shortcutDrawable(context, GlideApp.with(context), room.toMatrixItem(), iconSize)
-
+                                val bitmap = try {
+                                    avatarRenderer.shortcutDrawable(context, GlideApp.with(context), room.toMatrixItem(), iconSize)
+                                } catch (failure: Throwable) {
+                                    null
+                                }
                                 ShortcutInfoCompat.Builder(context, room.roomId)
                                         .setShortLabel(room.displayName)
-                                        .setIcon(bitmap.toProfileImageIcon())
+                                        .setIcon(bitmap?.toProfileImageIcon())
                                         .setIntent(intent)
                                         .build()
                             }