diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
index 97f89ce3f..8cdd86438 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -274,7 +274,7 @@ public class MessageSender {
 
       sendMediaMessage(context, recipient, forceSms, messageId, Collections.emptyList());
       onMessageSent();
-      threadDatabase.update(threadId, true);
+      threadDatabase.update(allocatedThreadId, true);
 
       return allocatedThreadId;
     } catch (MmsException e) {
@@ -318,7 +318,7 @@ public class MessageSender {
 
       sendMediaMessage(context, recipient, false, messageId, jobIds);
       onMessageSent();
-      threadDatabase.update(threadId, true);
+      threadDatabase.update(allocatedThreadId, true);
 
       return allocatedThreadId;
     } catch (MmsException e) {