diff --git a/js/models/conversations.js b/js/models/conversations.js
index b10635e8f..d52cd8bb8 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -925,11 +925,11 @@
         wrapDeferred(message.save()),
         wrapDeferred(this.save({ expireTimer })),
       ]).then(() => {
-        if (message.isIncoming()) {
+        // if change was made remotely, don't send it to the number/group
+        if (receivedAt) {
           return message;
         }
 
-        // change was made locally, send it to the number/group
         let sendFunc;
         if (this.get('type') === 'private') {
           sendFunc = textsecure.messaging.sendExpirationTimerUpdateToNumber;