diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 1ce4492ba16..5bc0cc8d636 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -214,6 +214,8 @@ public class PanelFragment extends Fragment {
         // Make the panel layout gone here, to avoid janky animation when updating from old panel.
         // We will make it visible once the panel is ready to load.
         mPanelSlices.setVisibility(View.GONE);
+        // Remove the animator to avoid a RecyclerView crash.
+        mPanelSlices.setItemAnimator(null);
 
         final Bundle arguments = getArguments();
         final String callingPackageName =