diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 7f4f12539..445130f4c 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -95,8 +95,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dip"
-                android:text="@string/settings_experimental"
-                android:visibility="gone" />
+                android:text="@string/settings_experimental" />
 
             <CheckBox
                 android:id="@+id/cbHttps"
diff --git a/src/biz/bokhorst/xprivacy/SettingsDialog.java b/src/biz/bokhorst/xprivacy/SettingsDialog.java
index a387057de..507688d5a 100644
--- a/src/biz/bokhorst/xprivacy/SettingsDialog.java
+++ b/src/biz/bokhorst/xprivacy/SettingsDialog.java
@@ -224,7 +224,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 		boolean parameters = PrivacyManager.getSettingBool(uid, PrivacyManager.cSettingParameters, false);
 		boolean log = PrivacyManager.getSettingBool(uid, PrivacyManager.cSettingLog, false);
 		boolean components = PrivacyManager.getSettingBool(uid, PrivacyManager.cSettingSystem, false);
-		boolean experimental = PrivacyManager.getSettingBool(uid, PrivacyManager.cSettingExperimental, false);
+		boolean experimental = PrivacyManager.getSettingBool(uid, PrivacyManager.cSettingExperimental,
+				!PrivacyManager.cStableRelease);
 		boolean https = PrivacyManager.getSettingBool(uid, PrivacyManager.cSettingHttps, true);
 		String confidence = PrivacyManager.getSetting(uid, PrivacyManager.cSettingConfidence, "");
 		final boolean expert = (components || experimental || !https || !"".equals(confidence));
diff --git a/src/biz/bokhorst/xprivacy/UpdateService.java b/src/biz/bokhorst/xprivacy/UpdateService.java
index d9d9a3f17..d55f53a77 100644
--- a/src/biz/bokhorst/xprivacy/UpdateService.java
+++ b/src/biz/bokhorst/xprivacy/UpdateService.java
@@ -201,6 +201,10 @@ private static void upgrade(Context context) throws NameNotFoundException {
 						Util.log(null, Log.WARN, "Deleting " + setting);
 						PrivacyManager.setSetting(setting.uid, setting.type, setting.name, null);
 					}
+
+			// Reset experimental setting
+			if (storedVersion.compareTo(new Version("2.1.21")) < 0)
+				PrivacyManager.setSetting(userId, PrivacyManager.cSettingExperimental, null);
 		} else
 			Util.log(null, Log.WARN, "No upgrade from version " + storedVersion + " to " + currentVersion);
 
diff --git a/src/biz/bokhorst/xprivacy/XBinder.java b/src/biz/bokhorst/xprivacy/XBinder.java
index c5a970fb6..cdc752df8 100644
--- a/src/biz/bokhorst/xprivacy/XBinder.java
+++ b/src/biz/bokhorst/xprivacy/XBinder.java
@@ -13,6 +13,7 @@
 
 public class XBinder extends XHook {
 	private Methods mMethod;
+	private static Boolean mStable = null;
 
 	private static long mToken = 0;
 	private static final int BITS_TOKEN = 16;
@@ -453,7 +454,12 @@ private void markIPC(XParam param) throws Throwable {
 									.startsWith("com.android.server.content.IContentServiceEx$Stub$Proxy"))) {
 						found = true;
 
-						if (PrivacyManager.cStableRelease) {
+						if (mStable == null) {
+							int userId = Util.getUserId(uid);
+							mStable = !PrivacyManager.getSettingBool(userId, PrivacyManager.cSettingExperimental,
+									!PrivacyManager.cStableRelease);
+						}
+						if (mStable) {
 							if (i + 1 < ste.length) {
 								String name = ste[i + 1].getClassName();
 								ok = (name.startsWith("android.") || name.startsWith("com.android."));