diff --git a/js/models/conversations.js b/js/models/conversations.js
index 54478ff9d..946dd04c5 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1039,14 +1039,6 @@
         this.lastMessage = message.getNotificationText();
         this.lastMessageStatus = 'sending';
 
-        this.set({
-          active_at: now,
-          timestamp: now,
-        });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
-          Conversation: Whisper.Conversation,
-        });
-
         if (this.isPrivate()) {
           message.set({ destination });
         }
@@ -1056,6 +1048,14 @@
         });
         message.set({ id });
 
+        this.set({
+          active_at: now,
+          timestamp: now,
+        });
+        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+          Conversation: Whisper.Conversation,
+        });
+
         // We're offline!
         if (!textsecure.messaging) {
           const errors = this.contactCollection.map(contact => {