diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 6a7b6b2..05ba3c6 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -201,7 +201,7 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mRestrictBackground) {
-            setAppRestrictBackground((Boolean) newValue);
+            setAppRestrictBackground(!(Boolean) newValue);
             return true;
         } else if (preference == mUnrestrictedData) {
             mDataSaverBackend.setIsWhitelisted(mAppItem.key, (Boolean) newValue);
@@ -223,7 +223,7 @@
 
     private void updatePrefs() {
         if (mRestrictBackground != null) {
-            mRestrictBackground.setChecked(getAppRestrictBackground());
+            mRestrictBackground.setChecked(!getAppRestrictBackground());
         }
         if (mUnrestrictedData != null) {
             mUnrestrictedData.setChecked(mDataSaverBackend.isWhitelisted(mAppItem.key));
