diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 005c7cb22..cf27ff43b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -519,7 +519,7 @@ public class ThreadDatabase extends Database {
   public long getUnreadThreadCount() {
     SQLiteDatabase db         = databaseHelper.getSignalReadableDatabase();
     String[]       projection = SqlUtil.buildArgs("COUNT(*)");
-    String         where      = READ + " != 1";
+    String         where      = READ + " != " + ReadStatus.READ.serialize() + " AND " + ARCHIVED + " = 0 AND " + MEANINGFUL_MESSAGES + " != 0";
 
     try (Cursor cursor = db.query(TABLE_NAME, projection, where, null, null, null, null)) {
       if (cursor != null && cursor.moveToFirst()) {