diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index c8befa0..c20b350 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -358,6 +358,7 @@
         }
         mMessages.setChecked(mConfig.allowMessages);
         mStarred.setSelectedValue(mConfig.allowFrom);
+        updateStarredEnabled();
         updateDays();
         mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
         mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
@@ -366,6 +367,10 @@
         updateEndSummary();
     }
 
+    private void updateStarredEnabled() {
+        mStarred.setEnabled(mConfig.allowCalls || mConfig.allowMessages);
+    }
+
     private void refreshAutomationSection() {
         if (mConditionProviders != null) {
             final int total = ConditionProviderSettings.getProviderCount(mPM);
@@ -453,6 +458,7 @@
                 mConfig = config;
                 if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
                 updateEndSummary();
+                updateStarredEnabled();
             }
             return success;
         } catch (Exception e) {
