diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 41cee97..e0dc389 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -149,10 +149,15 @@
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
-            mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
-            mRestrictBackground.setOnPreferenceChangeListener(this);
-            mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
-            mUnrestrictedData.setOnPreferenceChangeListener(this);
+            if (mAppItem.key == Process.SYSTEM_UID) {
+                removePreference(KEY_UNRESTRICTED_DATA);
+                removePreference(KEY_RESTRICT_BACKGROUND);
+            } else {
+                mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
+                mRestrictBackground.setOnPreferenceChangeListener(this);
+                mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
+                mUnrestrictedData.setOnPreferenceChangeListener(this);
+            }
             mDataSaverBackend = new DataSaverBackend(getContext());
             mAppSettings = findPreference(KEY_APP_SETTINGS);
 
