diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
index 94e568371..c1a626fb4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -249,13 +249,8 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
 
   void initializeBatchMode(boolean toggle) {
     this.batchMode = toggle;
-    unselectAllThreads();
-  }
-
-  private void unselectAllThreads() {
     batchSet.clear();
-
-    notifyItemRangeChanged(0, getItemCount(), Payload.SELECTION);
+    notifyDataSetChanged();
   }
 
   static final class ConversationViewHolder extends RecyclerView.ViewHolder {