diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
index 2615e51a2..e28bf5f89 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
@@ -106,10 +106,9 @@ object Stories {
     }
 
     Log.d(TAG, "Enqueuing downloads for up to $limit stories for $recipientId (force: $force)")
-    SignalDatabase.mms.getUnreadStories(recipientId, limit).use {
-      while (it.next != null) {
-        val record = it.current as MmsMessageRecord
-        enqueueAttachmentsFromStoryForDownloadSync(record, force)
+    SignalDatabase.mms.getUnreadStories(recipientId, limit).use { reader ->
+      reader.forEach {
+        enqueueAttachmentsFromStoryForDownloadSync(it as MmsMessageRecord, false)
       }
     }
   }