diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
index 4bcf5a1853..f225462c06 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
@@ -113,6 +113,11 @@ public final class MmsSendJob extends SendJob {
     return KEY;
   }
 
+  @Override
+  public void onAdded() {
+    DatabaseFactory.getMmsDatabase(context).markAsSending(messageId);
+  }
+
   @Override
   public void onSend() throws MmsException, NoSuchMessageException, IOException {
     MmsDatabase          database = DatabaseFactory.getMmsDatabase(context);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
index 4b91a482ef..2a962b050e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
@@ -65,6 +65,11 @@ public class SmsSendJob extends SendJob {
     return KEY;
   }
 
+  @Override
+  public void onAdded() {
+    DatabaseFactory.getSmsDatabase(context).markAsSending(messageId);
+  }
+
   @Override
   public void onSend() throws NoSuchMessageException, TooManyRetriesException {
     if (runAttempt >= MAX_ATTEMPTS) {