diff --git a/Cargo.toml b/Cargo.toml
index 9beea6058..54db4440c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,5 +5,5 @@ resolver = "2"
 [patch.crates-io]
 curve25519-dalek = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.1.3' }
 
-# [patch."https://github.com/whisperfish/libsignal-service-rs.git"]
-# libsignal-service = { path = "../libsignal-service-rs" }
+[patch."https://github.com/whisperfish/libsignal-service-rs.git"]
+libsignal-service = { path = "../libsignal-service-rs" }
diff --git a/presage-cli/src/main.rs b/presage-cli/src/main.rs
index 9ff8a3621..620230790 100644
--- a/presage-cli/src/main.rs
+++ b/presage-cli/src/main.rs
@@ -398,7 +398,7 @@ fn print_message<S: Store>(
         Sent(&'a Thread, String),
     }
 
-    if let Some(msg) = match &content.body {
+    if let Some(msg) = match &dbg!(content).body {
         ContentBody::NullMessage(_) => Some(Msg::Received(
             &thread,
             "Null message (for example deleted)".to_string(),
diff --git a/presage/src/manager/registered.rs b/presage/src/manager/registered.rs
index ee15dc4b7..466535b67 100644
--- a/presage/src/manager/registered.rs
+++ b/presage/src/manager/registered.rs
@@ -1005,7 +1005,7 @@ impl<S: Store> Manager<S, Registered> {
                 ..
             }) => {
                 if timer.is_none() {
-                    *timer = store_expire_timer.map(|(t, _)| t);
+                    *timer = store_expire_timer.map(|(t, _)| t).filter(|t| t > &0);
                     *version = Some(store_expire_timer.map(|(_, v)| v).unwrap_or_default());
                 } else {
                     *version = Some(store_expire_timer.map(|(_, v)| v).unwrap_or_default() + 1);