diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
index e97933a4db..da449be842 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
@@ -3,8 +3,13 @@ package org.thoughtcrime.securesms.conversation;
 /**
  * Activity which encapsulates a conversation for a Bubble window.
  *
- * This activity is empty, and exists so that we can override some of its manifest parameters
- * without clashing with ConversationActivity.
+ * This activity exists so that we can override some of its manifest parameters
+ * without clashing with {@link ConversationActivity} and provide an API-level
+ * independent "is in bubble?" check.
  */
 public class BubbleConversationActivity extends ConversationActivity {
+  @Override
+  protected boolean isInBubble() {
+    return true;
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index cd6bb99d57..bee0a4ffca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -66,6 +66,7 @@ import android.widget.Toast;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
@@ -2083,14 +2084,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
     }
   }
 
-  private boolean isInBubble() {
-    if (Build.VERSION.SDK_INT >= ConversationUtil.CONVERSATION_SUPPORT_VERSION) {
-      Display display = getDisplay();
-
-      return display != null && display.getDisplayId() != Display.DEFAULT_DISPLAY;
-    } else {
-      return false;
-    }
+  protected boolean isInBubble() {
+    return false;
   }
 
   private void initializeResources(@NonNull ConversationIntents.Args args) {