diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
index a275ac3b9..ca0fa267b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
@@ -58,10 +58,7 @@ class ExpirationSettingsViewModel(
     init {
         // SETUP
         viewModelScope.launch {
-            expirationConfig = storage.getExpirationConfiguration(threadId)?.let {
-                if (ExpirationConfiguration.isNewConfigEnabled) it
-                else if (it)
-            }
+            expirationConfig = storage.getExpirationConfiguration(threadId)
             val expirationType = expirationConfig?.expiryMode
             val recipient = threadDb.getRecipientForThreadId(threadId)
             _recipient.value = recipient