diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index 3a420df4d..a08398a32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -128,6 +128,7 @@ public final class StorageSyncHelper {
                                                          .setPreferContactAvatars(SignalStore.settings().isPreferSystemContactPhotos())
                                                          .setPayments(SignalStore.paymentsValues().mobileCoinPaymentsEnabled(), Optional.fromNullable(SignalStore.paymentsValues().getPaymentsEntropy()).transform(Entropy::getBytes).orNull())
                                                          .setPrimarySendsSms(Util.isDefaultSmsProvider(context))
+                                                         .setUniversalExpireTimer(SignalStore.settings().getUniversalExpireTimer())
                                                          .build();
 
     return SignalStorageRecord.forAccount(account);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 06ff65f1d..de75167a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -81,7 +81,7 @@ public final class FeatureFlags {
   private static final String MP4_GIF_SEND_SUPPORT              = "android.mp4GifSendSupport";
   private static final String MEDIA_QUALITY_LEVELS              = "android.mediaQuality.levels";
   private static final String GROUPS_V2_DESCRIPTION_VERSION     = "android.groupsv2.descriptionVersion";
-  private static final String DEFAULT_MESSAGE_TIMER             = "android.defaultMessageTimer";
+  private static final String DEFAULT_MESSAGE_TIMER             = "android.defaultMessageTimer.2";
 
   /**
    * We will only store remote values for flags in this set. If you want a flag to be controllable