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 f473c42639..b0c7aa7571 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -1492,7 +1492,7 @@ class AttachmentTable(
       .where("$ID = ?", attachmentId.id)
       .run()
       .readToSingleObject { cursor ->
-        if (cursor.isNull(DATA_FILE)) {
+        if (cursor.isNull(DATA_FILE) || cursor.isNull(DATA_RANDOM)) {
           null
         } else {
           cursor.readDataFileInfo()