diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml
index c281eb13..5680fda6 100644
--- a/doze/res/xml/gesture_panel.xml
+++ b/doze/res/xml/gesture_panel.xml
@@ -19,10 +19,10 @@
 
     <SwitchPreference
         android:key="always_on_display"
-        android:defaultValue="false"
         android:disableDependentsState="true"
         android:title="@string/ambient_display_always_on_title"
-        android:summary="@string/ambient_display_always_on_summary" />
+        android:summary="@string/ambient_display_always_on_summary"
+        android:persistent="false" />
 
     <PreferenceCategory
         android:key="proximity_sensor"
diff --git a/doze/src/org/lineageos/settings/doze/SamsungDozeSettings.java b/doze/src/org/lineageos/settings/doze/SamsungDozeSettings.java
index cdf6ac2e..546fec18 100644
--- a/doze/src/org/lineageos/settings/doze/SamsungDozeSettings.java
+++ b/doze/src/org/lineageos/settings/doze/SamsungDozeSettings.java
@@ -53,6 +53,7 @@ public class SamsungDozeSettings extends PreferenceFragment
 
         mAlwaysOnDisplayPreference = findPreference(Utils.ALWAYS_ON_DISPLAY);
         mAlwaysOnDisplayPreference.setEnabled(dozeEnabled);
+        mAlwaysOnDisplayPreference.setChecked(Utils.isAlwaysOnEnabled(getActivity()));
         mAlwaysOnDisplayPreference.setOnPreferenceChangeListener(this);
 
         mHandwavePreference = findPreference(Utils.GESTURE_HAND_WAVE_KEY);
diff --git a/doze/src/org/lineageos/settings/doze/Utils.java b/doze/src/org/lineageos/settings/doze/Utils.java
index e5b7daa2..c8746900 100644
--- a/doze/src/org/lineageos/settings/doze/Utils.java
+++ b/doze/src/org/lineageos/settings/doze/Utils.java
@@ -64,7 +64,7 @@ public final class Utils {
         return new AmbientDisplayConfiguration(context).alwaysOnAvailable();
     }
 
-    private static boolean isAlwaysOnEnabled(Context context) {
+    protected static boolean isAlwaysOnEnabled(Context context) {
         return Settings.Secure.getIntForUser(context.getContentResolver(),
                 DOZE_ALWAYS_ON, 1, UserHandle.USER_CURRENT) != 0;
     }