diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index e91a8497706..20483844ffe 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -91,6 +91,8 @@ public class AppNotificationSettings extends NotificationSettingsBase {
 
         if (getPreferenceScreen() != null) {
             getPreferenceScreen().removeAll();
+            mChannelGroups.clear();
+            mShowLegacyChannelConfig = false;
         }
 
         addPreferencesFromResource(R.xml.app_notification_settings);