diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 5b3973c04..87a88be84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1750,21 +1750,16 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
             val userGroups = configFactory.userGroups ?: return
             val groupPublicKey = GroupUtil.addressToGroupSessionId(recipient.address)
             val expiryMode = config.expiryMode
-            val groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey)?.let { info ->
-                info.copy(disappearingTimer = when (expiryMode) {
-                    null, ExpiryMode.NONE -> 0
-                    else -> expiryMode.expirySeconds
-                })
-            } ?: return
+            val groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey)
+                ?.copy(disappearingTimer = expiryMode.expirySeconds) ?: return
             userGroups.set(groupInfo)
         } else if (recipient.isLocalNumber) {
             val user = configFactory.user ?: return
-            user.setNtsExpiry(config.expiryMode ?: ExpiryMode.NONE)
+            user.setNtsExpiry(config.expiryMode)
         } else if (recipient.isContactRecipient) {
             val contacts = configFactory.contacts ?: return
-            val expiry = config.expiryMode
             val contact = contacts.get(recipient.address.serialize())?.copy(
-                expiryMode = expiry ?: ExpiryMode.NONE
+                expiryMode = config.expiryMode
             ) ?: return
             contacts.set(contact)
         }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt
index fc14fb804..5fd186622 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt
@@ -4,10 +4,10 @@ import network.loki.messenger.libsession_util.util.ExpiryMode
 
 data class ExpirationConfiguration(
     val threadId: Long = -1,
-    val expiryMode: ExpiryMode? = null,
+    val expiryMode: ExpiryMode = ExpiryMode.NONE,
     val updatedTimestampMs: Long = 0
 ) {
-    val isEnabled = expiryMode != null && expiryMode.expirySeconds > 0
+    val isEnabled = expiryMode.expirySeconds > 0
 
     companion object {
         val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */