diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index ee3f54f70e0..274817e3819 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -118,7 +118,7 @@ public class BatterySaverButtonPreferenceController extends
     @Override
     public boolean setChecked(boolean stateOn) {
         return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
-                true /* needFirstTimeWarning */);
+                false /* needFirstTimeWarning */);
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
index 4f26754b212..9a7ef409f95 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -18,17 +18,13 @@ package com.android.settings.fuelgauge.batterysaver;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.provider.SettingsSlicesContract;
@@ -85,6 +81,15 @@ public class BatterySaverButtonPreferenceControllerTest {
         assertThat(mPreference.isChecked()).isFalse();
     }
 
+    @Test
+    public void onSwitchChanged_isCheckedAndAcked_setPowerSaveMode() {
+        setLowPowerWarningAcked(/* acked= */ 1);
+
+        mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ true);
+
+        verify(mPowerManager).setPowerSaveModeEnabled(true);
+    }
+
     @Test
     public void updateState_lowPowerOn_preferenceIsChecked() {
         when(mPowerManager.isPowerSaveMode()).thenReturn(true);
@@ -104,11 +109,10 @@ public class BatterySaverButtonPreferenceControllerTest {
     }
 
     @Test
-    public void setChecked_on_showWarningMessage() {
+    public void setChecked_on_setPowerSaveMode() {
         mController.setChecked(true);
 
-        verify(mContext).sendBroadcast(any(Intent.class));
-        verify(mPowerManager, never()).setPowerSaveModeEnabled(anyBoolean());
+        verify(mPowerManager).setPowerSaveModeEnabled(true);
     }
 
     @Test
@@ -143,5 +147,9 @@ public class BatterySaverButtonPreferenceControllerTest {
                 mContext.getContentResolver(),
                 Settings.Secure.LOW_POWER_WARNING_ACKNOWLEDGED,
                 acked);
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED,
+                acked);
     }
 }