diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
index ea5313c3b6..21222545f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
@@ -63,6 +63,7 @@ public class MediaDatabase extends Database {
                                                    + " FROM " + MmsDatabase.TABLE_NAME
                                                    + " WHERE " + MmsDatabase.THREAD_ID + " __EQUALITY__ ?) AND (%s) AND "
                                                    + MmsDatabase.VIEW_ONCE + " = 0 AND "
+                                                   + MmsDatabase.STORY_TYPE + " = 0 AND "
                                                    + AttachmentDatabase.DATA + " IS NOT NULL AND "
                                                    + "(" + AttachmentDatabase.QUOTE + " = 0 OR (" + AttachmentDatabase.QUOTE + " = 1 AND " + AttachmentDatabase.DATA_HASH + " IS NULL)) AND "
                                                    + AttachmentDatabase.STICKER_PACK_ID + " IS NULL AND "