diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 56b057be93..5f506a8007 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -2422,9 +2422,13 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
         findStoryMessage(conversation.id, initialMessage.storyContext),
       ]);
 
-      if (initialMessage.storyContext && !storyQuote) {
+      if (
+        initialMessage.storyContext &&
+        !storyQuote &&
+        !isDirectConversation(conversation.attributes)
+      ) {
         log.warn(
-          `handleDataMessage/${idLog}: Received storyContext message but no matching story. Dropping.`
+          `handleDataMessage/${idLog}: Received storyContext message in group but no matching story. Dropping.`
         );
 
         confirm();
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index f1afb64098..fe905d7285 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1942,12 +1942,12 @@ export default class MessageReceiver
       return;
     }
 
-    const expireTimer = Math.min(
-      Math.floor((envelope.timestamp + durations.DAY - Date.now()) / 1000),
-      durations.DAY / 1000
+    const timeRemaining = Math.min(
+      Math.floor(envelope.timestamp + durations.DAY - Date.now()),
+      durations.DAY
     );
 
-    if (expireTimer <= 0) {
+    if (timeRemaining <= 0) {
       log.info(
         'MessageReceiver.handleStoryMessage: story already expired',
         logId
@@ -1959,7 +1959,7 @@ export default class MessageReceiver
     const message: ProcessedDataMessage = {
       attachments,
       canReplyToStory: Boolean(msg.allowsReplies),
-      expireTimer,
+      expireTimer: durations.DAY / 1000,
       flags: 0,
       groupV2,
       isStory: true,