diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveReleaseChannelJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveReleaseChannelJob.kt
index 8ff0b1a257..5d5d485be5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveReleaseChannelJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveReleaseChannelJob.kt
@@ -102,8 +102,9 @@ class RetrieveReleaseChannelJob private constructor(private val force: Boolean,
       return
     }
 
-    if (SignalDatabase.threads.getUnarchivedConversationListCount() < 6) {
+    if (values.previousManifestMd5.isEmpty() && (SignalDatabase.threads.getArchivedConversationListCount() + SignalDatabase.threads.getUnarchivedConversationListCount()) < 6) {
       Log.i(TAG, "User does not have enough conversations to show release channel")
+      values.nextScheduledCheck = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7)
       return
     }