diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
index acbde9fa3efa5..c170ee271e1db 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
@@ -368,6 +368,10 @@ public class BubbleData {
 
         final Predicate<Bubble> invalidBubblesFromPackage = bubble -> {
             final boolean bubbleIsFromPackage = packageName.equals(bubble.getPackageName());
+            final boolean isShortcutBubble = bubble.hasMetadataShortcutId();
+            if (!bubbleIsFromPackage || !isShortcutBubble) {
+                return false;
+            }
             final boolean hasShortcutIdAndValidShortcut =
                     bubble.hasMetadataShortcutId()
                             && bubble.getShortcutInfo() != null