diff --git a/res/xml/trust_agent_settings.xml b/res/xml/trust_agent_settings.xml
index e9374f3a9dc..2bf71fb028c 100644
--- a/res/xml/trust_agent_settings.xml
+++ b/res/xml/trust_agent_settings.xml
@@ -16,4 +16,9 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="trust_agents"
-    android:title="@string/manage_trust_agents" />
+    android:title="@string/manage_trust_agents">
+
+    <!-- Needed so PreferenceGroupAdapter allows SwitchPreference to be
+         recycled. Removed in onResume -->
+    <SwitchPreference android:key="dummy_preference" />
+</PreferenceScreen>
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index 37a86ebb164..498ec5b754b 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -79,6 +79,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements
 
     public void onResume() {
         super.onResume();
+        removePreference("dummy_preference");
         updateAgents();
     };