diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index a1ccee2e2..53ca4a1b9 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -2431,7 +2431,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
             message.set({ expireTimer: dataMessage.expireTimer });
           }
 
-          if (!hasGroupV2Prop) {
+          if (!hasGroupV2Prop && !isStory(message.attributes)) {
             if (isExpirationTimerUpdate(message.attributes)) {
               message.set({
                 expirationTimerUpdate: {
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index 79cb0b81d..e1dfa880d 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1811,7 +1811,10 @@ export default class MessageReceiver
       return;
     }
 
-    const expireTimer = envelope.timestamp + durations.DAY - Date.now();
+    const expireTimer = Math.min(
+      (envelope.serverTimestamp + durations.DAY - Date.now()) / 1000,
+      durations.DAY / 1000
+    );
 
     if (expireTimer <= 0) {
       log.info(