diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
index 5407104718..5308f13b56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -270,12 +270,13 @@ public abstract class PushSendJob extends SendJob {
                                .toList());
 
     if (message.getOutgoingQuote() != null && message.getOutgoingQuote().getAttachment() != null) {
-      AttachmentId        attachmentId  = ((DatabaseAttachment) message.getOutgoingQuote().getAttachment()).attachmentId;
-      AttachmentUploadJob quoteUploadJob = new AttachmentUploadJob(attachmentId);
+      AttachmentId attachmentId = ((DatabaseAttachment) message.getOutgoingQuote().getAttachment()).attachmentId;
 
-      jobManager.add(quoteUploadJob);
-
-      jobs.add(quoteUploadJob.getId());
+      if (SignalDatabase.attachments().hasData(attachmentId)) {
+        AttachmentUploadJob quoteUploadJob = new AttachmentUploadJob(attachmentId);
+        jobManager.add(quoteUploadJob);
+        jobs.add(quoteUploadJob.getId());
+      }
     }
 
     return jobs;