diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt
index 0d44faccea..4db91ee9b2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt
@@ -242,7 +242,7 @@ sealed class ConversationListViewModel(
 
   private fun setSelection(newSelection: Collection<Conversation>) {
     store.update {
-      val selection = newSelection.toSet()
+      val selection = newSelection.filter { select -> select.type == Conversation.Type.THREAD }.toSet()
       it.copy(internalSelection = selection, selectedConversations = ConversationSet(selection))
     }
   }