diff --git a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
index 937b4a72e1..41f8942db5 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
@@ -103,6 +103,10 @@ public class MmsSendJob extends MasterSecretJob {
   }
 
   private void populatePartData(PduPart part, MasterSecret masterSecret) throws IOException {
+    if (part.getDataUri() == null) {
+      return;
+    }
+
     ByteArrayOutputStream os = part.getDataSize() > 0 && part.getDataSize() < Integer.MAX_VALUE
                              ? new ByteArrayOutputStream((int)part.getDataSize())
                              : new ByteArrayOutputStream();