diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
index 97f579f45a..e11332da8f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
@@ -257,7 +257,7 @@ class MediaSelectionRepository(context: Context) {
         emptyList(),
         if (recipient.isDistributionList) distributionListPreUploadSentTimestamps.getOrPut(preUploadResults.first()) { System.currentTimeMillis() } else System.currentTimeMillis(),
         -1,
-        TimeUnit.SECONDS.toMillis(recipient.expiresInSeconds.toLong()),
+        if (isStory) 0 else TimeUnit.SECONDS.toMillis(recipient.expiresInSeconds.toLong()),
         isViewOnce,
         ThreadTable.DistributionTypes.DEFAULT,
         storyType,
@@ -300,7 +300,7 @@ class MediaSelectionRepository(context: Context) {
                 listOf(MediaUploadRepository.asAttachment(context, it)),
                 if (recipient.isDistributionList) distributionListStoryClipsSentTimestamps.getOrPut(it.asKey()) { System.currentTimeMillis() } else System.currentTimeMillis(),
                 -1,
-                TimeUnit.SECONDS.toMillis(recipient.expiresInSeconds.toLong()),
+                0,
                 isViewOnce,
                 ThreadTable.DistributionTypes.DEFAULT,
                 storyType,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
index 6bd7e36679..09c3aacfe2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -145,8 +145,8 @@ public class MessageSender {
     Log.i(TAG, "Sending story messages to " + messages.size() + " targets.");
     ThreadTable  threadTable = SignalDatabase.threads();
     MessageTable database    = SignalDatabase.mms();
-    List<Long>     messageIds     = new ArrayList<>(messages.size());
-    List<Long>            threads         = new ArrayList<>(messages.size());
+    List<Long>   messageIds  = new ArrayList<>(messages.size());
+    List<Long>   threads     = new ArrayList<>(messages.size());
     UploadDependencyGraph dependencyGraph;
 
     try {