diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
index c74a6e2a70..23ccc6c4f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -1448,14 +1448,15 @@ class AttachmentTable(
 
     val filesInDb: MutableSet<String> = HashSet(filesOnDisk.size)
 
-    readableDatabase
-      .select(DATA_FILE, THUMBNAIL_FILE)
-      .from(TABLE_NAME)
-      .run()
-      .forEach { cursor ->
-        cursor.requireString(DATA_FILE)?.let { filesInDb += it }
-        cursor.requireString(THUMBNAIL_FILE)?.let { filesInDb += it }
-      }
+    readableDatabase.withinTransaction { db ->
+      db.select(DATA_FILE, THUMBNAIL_FILE)
+        .from(TABLE_NAME)
+        .run()
+        .forEach { cursor ->
+          cursor.requireString(DATA_FILE)?.let { filesInDb += it }
+          cursor.requireString(THUMBNAIL_FILE)?.let { filesInDb += it }
+        }
+    }
 
     filesInDb += SignalDatabase.stickers.getAllStickerFiles()