diff --git a/res/values/strings.xml b/res/values/strings.xml
index 86f2fd23911..6c757284bfa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5894,8 +5894,14 @@
     <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
     <string name="zen_mode_end_time">End time</string>
 
-    <!-- [CHAR LIMIT=20] Zen mode settings: End time option: Summary text value format -->
-    <string name="zen_mode_end_time_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = priority and end time = next day -->
+    <string name="zen_mode_end_time_priority_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
+
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = same day -->
+    <string name="zen_mode_end_time_none_same_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> or any alarm before</string>
+
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = next day -->
+    <string name="zen_mode_end_time_none_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day or any alarm before</string>
 
     <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
     <string name="notification_settings_apps_title">App notifications</string>
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 71ff6645c88..99e112c35ca 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -379,7 +379,15 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
         final int startMin = 60 * mConfig.sleepStartHour + mConfig.sleepStartMinute;
         final int endMin = 60 * mConfig.sleepEndHour + mConfig.sleepEndMinute;
         final boolean nextDay = startMin >= endMin;
-        mEnd.setSummaryFormat(nextDay ? R.string.zen_mode_end_time_summary_format : 0);
+        final int summaryFormat;
+        if (mConfig.sleepNone) {
+            summaryFormat = nextDay ? R.string.zen_mode_end_time_none_next_day_summary_format
+                    : R.string.zen_mode_end_time_none_same_day_summary_format;
+        } else {
+            summaryFormat = nextDay ? R.string.zen_mode_end_time_priority_next_day_summary_format
+                    : 0;
+        }
+        mEnd.setSummaryFormat(summaryFormat);
     }
 
     private void updateControls() {