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 85f5f8fd7..d2db4d957 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -505,7 +505,7 @@ open class Storage(
                 setExpirationConfiguration(currentExpiration)
             } else {
                 val expiration = ExpirationConfiguration(ourThread, userProfile.getNtsExpiry(), messageTimestamp)
-                DatabaseComponent.get(context).expirationConfigurationDatabase().setExpirationConfiguration(expiration)
+                setExpirationConfiguration(expiration)
             }
         }
 
@@ -648,9 +648,7 @@ open class Storage(
                     val newConfig = ExpirationConfiguration(
                         conversationThreadId, mode, messageTimestamp
                     )
-                    DatabaseComponent.get(context)
-                        .expirationConfigurationDatabase()
-                        .setExpirationConfiguration(newConfig)
+                    setExpirationConfiguration(newConfig)
                 }
             }
         }