diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index f0c23ea663..f0b274a3aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -3231,6 +3231,14 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       }.flatten().toSet()
     }
 
+    threadIds.forEach {
+      threads.update(
+        threadId = it,
+        unarchive = false,
+        allowDeletion = true
+      )
+    }
+
     notifyConversationListeners(threadIds)
     notifyConversationListListeners()
     return rowsDeleted