diff --git a/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java b/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
index 766e4aafc42..5a6fa51b2c8 100644
--- a/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
@@ -66,6 +66,7 @@ public class ConversationPromotePreferenceController extends NotificationPrefere
             return false;
         }
         mChannel.setDemoted(false);
+        mChannel.setBypassDnd(false);
         saveChannel();
 
         if (mHostFragment != null) {
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java
index 9b60c97805c..80e2dd5d103 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java
@@ -110,6 +110,7 @@ public class ConversationPromotePreferenceControllerTest {
         NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
         channel.setConversationId("a", "a");
         channel.setDemoted(true);
+        channel.setBypassDnd(true);
         mController.onResume(appRow, channel, null, null, null, null);
 
         Preference pref = mock(Preference.class);
@@ -121,6 +122,7 @@ public class ConversationPromotePreferenceControllerTest {
 
         verify(mBackend).updateChannel(eq(null), anyInt(), captor.capture());
         assertFalse(captor.getValue().isDemoted());
+        assertFalse(captor.getValue().canBypassDnd());
 
         verify(mFragment).getActivity();
     }