diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 0810e0d6ac..3d40f0bc20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -269,7 +269,8 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
   @Override
   public void onStart() {
     super.onStart();
-    ConversationFragment.prepare(requireContext());
+    // TODO [greyson] Re-enable when we figure out how to invalidate the cache after a system theme change
+//    ConversationFragment.prepare(requireContext());
   }
 
   @Override