diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
index 67b158197b..b728210330 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
@@ -283,6 +283,8 @@ public final class AttachmentCompressionJob extends BaseJob {
                                                             100,
                                                             percent));
                 }, outputStream, cancelationSignal);
+              } catch (EncodingException e) {
+                throw new UndeliverableMessageException("Failure during encoding", e);
               }
 
               eventBus.postSticky(new PartProgressEvent(attachment,