diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
index b59be6475..155841f05 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
@@ -520,6 +520,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
     val allCount: Long = readableDatabase
       .select("SUM($UNREAD_COUNT)")
       .from(TABLE_NAME)
+      .where("$ARCHIVED = ?", 0)
       .run()
       .use { cursor ->
         if (cursor.moveToFirst()) {
@@ -532,7 +533,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
     val forcedUnreadCount: Long = readableDatabase
       .select("COUNT(*)")
       .from(TABLE_NAME)
-      .where("$READ = ?", ReadStatus.FORCED_UNREAD.serialize())
+      .where("$READ = ? AND $ARCHIVED = ?", ReadStatus.FORCED_UNREAD.serialize(), 0)
       .run()
       .use { cursor ->
         if (cursor.moveToFirst()) {