diff --git a/js/models/conversations.js b/js/models/conversations.js
index 41a0f12e4..18efe75bb 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -108,6 +108,7 @@
       this.on('change:profileKey', this.onChangeProfileKey);
       this.on('destroy', this.revokeAvatarUrl);
 
+      this.on('newmessage', this.addSingleMessage);
       this.on('expired', this.onExpired);
       this.listenTo(
         this.messageCollection,
@@ -145,6 +146,7 @@
 
     addSingleMessage(message) {
       const model = this.messageCollection.add(message, { merge: true });
+      model.setToExpire();
       this.processQuotes(this.messageCollection);
       return model;
     },
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 893c6f038..61cced438 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -805,9 +805,6 @@
       // This is debounced, so it won't hit the database too often.
       this.lazyUpdateVerified();
 
-      this.model.addSingleMessage(message);
-      message.setToExpire();
-
       if (message.isOutgoing()) {
         this.removeLastSeenIndicator();
       }