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 7ba0f4fb6..fe775319b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -796,6 +796,10 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   }
 
   private void onSubmitList(@NonNull ConversationListViewModel.ConversationList conversationList) {
+    if (conversationList.getConversations().isDetached()) {
+      return;
+    }
+
     defaultAdapter.submitList(conversationList.getConversations());
 
     onPostSubmitList();