diff --git a/presage/src/manager/registered.rs b/presage/src/manager/registered.rs
index ef5c39cc9..f6ffab491 100644
--- a/presage/src/manager/registered.rs
+++ b/presage/src/manager/registered.rs
@@ -46,7 +46,7 @@ use tokio::sync::Mutex;
 
 use crate::cache::CacheCell;
 use crate::serde::serde_profile_key;
-use crate::store::{Store, Thread};
+use crate::store::{ContentsStore, Store, Thread};
 use crate::{Error, Manager};
 
 type ServiceCipher<S> = cipher::ServiceCipher<S, StdRng>;
@@ -1132,7 +1132,9 @@ async fn save_message<S: Store>(
                 store.upsert_profile_key(&sender_uuid, profile_key)?;
             }
 
-            store.update_expire_timer(&thread, data_message.expire_timer.unwrap_or_default())?;
+            if let Some(expire_timer) = data_message.expire_timer {
+                store.update_expire_timer(&thread, expire_timer)?;
+            }
 
             match data_message {
                 DataMessage {