diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
index 4e4c392547..d164cfdb95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
@@ -68,7 +68,8 @@ public final class BubbleUtil {
     NotificationChannel conversationChannel = notificationManager.getNotificationChannel(ConversationUtil.getChannelId(context, recipient),
                                                                                          ConversationUtil.getShortcutId(recipientId));
 
-    return notificationManager.areBubblesAllowed() || (conversationChannel != null && conversationChannel.canBubble());
+    return (Build.VERSION.SDK_INT < 31 || (notificationManager.areBubblesEnabled() && notificationManager.getBubblePreference() != NotificationManager.BUBBLE_PREFERENCE_NONE)) &&
+           (notificationManager.areBubblesAllowed() || (conversationChannel != null && conversationChannel.canBubble()));
   }
 
   /**