diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 994546db8d3..dbfa2f746d0 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -120,8 +120,9 @@ public class BrightnessPreference extends SeekBarPreference implements
             if (mAutomaticAvailable) {
                 setMode(mOldAutomatic);
             }
-            // brightness needs to be restored after restoring ALS mode
-            setBrightness(mOldBrightness);
+            if (!mAutomaticAvailable || mOldAutomatic == 0) {
+                setBrightness(mOldBrightness);
+            }
         }
     }