diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 8ca4e0ddda1..b3a11173821 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -37,12 +37,12 @@
         android:visibility="gone"
         settings:allowDividerAbove="false"
         settings:allowDividerBelow="false">
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="invalid_conversation_switch"
-            android:title="@string/conversation_section_switch_title" />
-        <Preference
-            android:key="invalid_conversation_info"/>
     </PreferenceCategory>
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="invalid_conversation_switch"
+        android:title="@string/conversation_section_switch_title" />
+    <Preference
+        android:key="invalid_conversation_info"/>
 
     <!--Bubbles -->
     <Preference
diff --git a/src/com/android/settings/notification/AppBubbleListPreferenceController.java b/src/com/android/settings/notification/AppBubbleListPreferenceController.java
index 5564f43ecca..33842b6d75b 100644
--- a/src/com/android/settings/notification/AppBubbleListPreferenceController.java
+++ b/src/com/android/settings/notification/AppBubbleListPreferenceController.java
@@ -72,9 +72,20 @@ public class AppBubbleListPreferenceController extends AppConversationListPrefer
 
     @Override
     public boolean isAvailable() {
-        if (!super.isAvailable()) {
+        // copy rather than inherit super's isAvailable because apps can link to this page
+        // as part of onboarding, before they send a valid conversation notification
+        if (mAppRow == null) {
             return false;
         }
+        if (mAppRow.banned) {
+            return false;
+        }
+        if (mChannel != null) {
+            if (mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)
+                    || NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
+                return false;
+            }
+        }
         if (mAppRow.bubblePreference == BUBBLE_PREFERENCE_NONE) {
             return false;
         }
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 83df3239d39..483e8aaa33e 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -268,6 +268,15 @@ public class NotificationBackend {
         }
     }
 
+    public boolean hasSentValidMsg(String pkg, int uid) {
+        try {
+            return sINM.hasSentValidMsg(pkg, uid);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
     public boolean isInInvalidMsgState(String pkg, int uid) {
         try {
             return sINM.isInInvalidMsgState(pkg, uid);
diff --git a/src/com/android/settings/notification/app/AppConversationListPreferenceController.java b/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
index 364a81c4821..20b16d7d2a1 100644
--- a/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
@@ -46,7 +46,6 @@ public class AppConversationListPreferenceController extends NotificationPrefere
 
     protected List<ConversationChannelWrapper> mConversations = new ArrayList<>();
     protected PreferenceCategory mPreference;
-    private boolean mIsInInvalidMsgState;
 
     public AppConversationListPreferenceController(Context context, NotificationBackend backend) {
         super(context, backend);
@@ -71,7 +70,8 @@ public class AppConversationListPreferenceController extends NotificationPrefere
                 return false;
             }
         }
-        return true;
+        return mBackend.hasSentValidMsg(mAppRow.pkg, mAppRow.uid) || mBackend.isInInvalidMsgState(
+                mAppRow.pkg, mAppRow.uid);
     }
 
     @Override
@@ -88,7 +88,6 @@ public class AppConversationListPreferenceController extends NotificationPrefere
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... unused) {
-                mIsInInvalidMsgState = mBackend.isInInvalidMsgState(mAppRow.pkg, mAppRow.uid);
                 ParceledListSlice<ConversationChannelWrapper> list =
                         mBackend.getConversations(mAppRow.pkg, mAppRow.uid);
                 if (list != null) {
@@ -122,7 +121,7 @@ public class AppConversationListPreferenceController extends NotificationPrefere
             return;
         }
 
-        if (!mIsInInvalidMsgState && !mConversations.isEmpty()) {
+        if (!mConversations.isEmpty()) {
             // TODO: if preference has children, compare with newly loaded list
             mPreference.removeAll();
             mPreference.setTitle(getTitleResId());
diff --git a/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
index 06c6f3a1a84..7519c23c9fa 100644
--- a/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
+++ b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
@@ -49,7 +49,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon
         if (!super.isAvailable()) {
             return false;
         }
-        if (mAppRow == null && mChannel == null) {
+        if (mAppRow == null) {
             return false;
         }
         if (mChannel != null) {
@@ -62,7 +62,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon
                 return mAppRow != null;
             }
         }
-        return isGloballyEnabled();
+        return isGloballyEnabled() && mBackend.hasSentValidMsg(mAppRow.pkg, mAppRow.uid);
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
index 9d664ac02c8..af7b1085cb4 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
@@ -31,6 +31,8 @@ import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -59,6 +61,7 @@ public class BubbleSummaryPreferenceControllerTest {
     private Context mContext;
     @Mock
     private NotificationBackend mBackend;
+    NotificationBackend.AppRow mAppRow;
 
     private BubbleSummaryPreferenceController mController;
 
@@ -67,6 +70,10 @@ public class BubbleSummaryPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
         ShadowApplication shadowApplication = ShadowApplication.getInstance();
         mContext = RuntimeEnvironment.application;
+        when(mBackend.hasSentValidMsg(anyString(), anyInt())).thenReturn(true);
+        mAppRow = new NotificationBackend.AppRow();
+        mAppRow.pkg = "pkg";
+        mAppRow.uid = 0;
         mController = spy(new BubbleSummaryPreferenceController(mContext, mBackend));
     }
 
@@ -85,20 +92,27 @@ public class BubbleSummaryPreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_nullChannelNOTIFICATION_BUBBLESisOn_shouldReturnTrue() {
+    public void isAvailable_NOTIFICATION_BUBBLESisOn_shouldReturnTrue() {
         Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
-        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
-        mController.onResume(appRow, null, null, null, null, null);
+        mController.onResume(mAppRow, null, null, null, null, null);
 
         assertTrue(mController.isAvailable());
     }
 
     @Test
-    public void isAvailable_nullChannelNOTIFICATION_BUBBLESisOff_shouldReturnFalse() {
+    public void isAvailable_NOTIFICATION_BUBBLESisOn_neverSentMsg_shouldReturnFalse() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+        mController.onResume(mAppRow, null, null, null, null, null);
+        when(mBackend.hasSentValidMsg(anyString(), anyInt())).thenReturn(false);
+
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_NOTIFICATION_BUBBLESisOff_shouldReturnFalse() {
         Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
                 SYSTEM_WIDE_OFF);
-        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
-        mController.onResume(appRow, null, null, null, null, null);
+        mController.onResume(mAppRow, null, null, null, null, null);
 
         assertFalse(mController.isAvailable());
     }
@@ -107,10 +121,9 @@ public class BubbleSummaryPreferenceControllerTest {
     public void isAvailable_nonNullChannelNOTIFICATION_BUBBLESisOff_shouldReturnFalse() {
         Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
                 SYSTEM_WIDE_OFF);
-        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
-        mController.onResume(appRow, channel, null, null, null, null);
+        mController.onResume(mAppRow, channel, null, null, null, null);
 
         assertFalse(mController.isAvailable());
     }
@@ -118,20 +131,18 @@ public class BubbleSummaryPreferenceControllerTest {
     @Test
     public void isAvailable_defaultChannelNOTIFICATION_BUBBLESisOn_shouldReturnTrue() {
         Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
-        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
-        mController.onResume(appRow, channel, null, null, null, null);
+        mController.onResume(mAppRow, channel, null, null, null, null);
 
         assertTrue(mController.isAvailable());
     }
 
     @Test
     public void updateState_setsIntent() {
-        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
-        appRow.bubblePreference = BUBBLE_PREFERENCE_ALL;
-        mController.onResume(appRow, null, null, null, null, null);
+        mAppRow.bubblePreference = BUBBLE_PREFERENCE_ALL;
+        mController.onResume(mAppRow, null, null, null, null, null);
 
         Preference pref = new Preference(mContext);
         mController.updateState(pref);