diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
index 8e8a5d5e8a..bdd7d026f9 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
@@ -160,12 +160,10 @@ class RoomGroupMessageCreator @Inject constructor(
     }
 
     private fun getRoomBitmap(events: List<NotifiableMessageEvent>): Bitmap? {
-        if (events.isEmpty()) return null
-
         // Use the last event (most recent?)
-        val roomAvatarPath = events.last().roomAvatarPath
-
-        return bitmapLoader.getRoomBitmap(roomAvatarPath)
+        return events.lastOrNull()
+                ?.roomAvatarPath
+                ?.let { bitmapLoader.getRoomBitmap(it) }
     }
 }