diff --git a/src/chat.rs b/src/chat.rs
index 23c5a7725..e89a0561e 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -1620,8 +1620,12 @@ pub fn hide_device_expired_messages(context: &Context) -> Result<bool, Error> {
     if let Some(delete_device_after) = context.get_config_delete_device_after() {
         let threshold_timestamp = time() - delete_device_after;
 
-        let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)?.0;
-        let device_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)?.0;
+        let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)
+            .unwrap_or_default()
+            .0;
+        let device_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)
+            .unwrap_or_default()
+            .0;
 
         // Hide expired messages
         //
diff --git a/src/chatlist.rs b/src/chatlist.rs
index 174c1a252..00380ed7f 100644
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -94,7 +94,9 @@ impl Chatlist {
     ) -> Result<Self> {
         // Note that we do not emit DC_EVENT_MSGS_MODIFIED here even if some
         // messages get hidden to avoid reloading the same chatlist.
-        hide_device_expired_messages(context)?;
+        if let Err(err) = hide_device_expired_messages(context) {
+            warn!(context, "Failed to hide expired messages: {}", err);
+        }
 
         let mut add_archived_link_item = false;