diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt
index 0c25d144938c2..390f7064a2271 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt
@@ -162,7 +162,7 @@ internal class BubbleDataRepository @Inject constructor(
         // into Bubble.
         val bubbles = entities.mapNotNull { entity ->
             shortcutMap[ShortcutKey(entity.userId, entity.packageName)]
-                    ?.first { shortcutInfo -> entity.shortcutId == shortcutInfo.id }
+                    ?.firstOrNull { shortcutInfo -> entity.shortcutId == shortcutInfo.id }
                     ?.let { shortcutInfo -> Bubble(
                             entity.key,
                             shortcutInfo,