diff --git a/src/api/client_server/sync/msc3575.rs b/src/api/client_server/sync/msc3575.rs
index 52ce877d..31333eaf 100644
--- a/src/api/client_server/sync/msc3575.rs
+++ b/src/api/client_server/sync/msc3575.rs
@@ -148,8 +148,8 @@ pub(crate) async fn sync_events_v4_route(
                         "",
                     )?;
 
-                let joined_since_last_sync = since_sender_member
-                    .map_or(true, |member| {
+                let joined_since_last_sync =
+                    since_sender_member.is_none_or(|member| {
                         member.membership != MembershipState::Join
                     });
 
diff --git a/src/api/client_server/sync/v3.rs b/src/api/client_server/sync/v3.rs
index 8046bc0f..9ac70a73 100644
--- a/src/api/client_server/sync/v3.rs
+++ b/src/api/client_server/sync/v3.rs
@@ -495,7 +495,7 @@ async fn load_joined_room(
                 });
 
         let joined_since_last_sync = since_sender_member
-            .map_or(true, |member| member.membership != MembershipState::Join);
+            .is_none_or(|member| member.membership != MembershipState::Join);
 
         if since_shortstatehash.is_none() || joined_since_last_sync {
             // Probably since = 0, we will do an initial sync
diff --git a/src/database/key_value/pusher.rs b/src/database/key_value/pusher.rs
index bd80288a..000c9a5d 100644
--- a/src/database/key_value/pusher.rs
+++ b/src/database/key_value/pusher.rs
@@ -27,7 +27,7 @@ impl service::pusher::Data for KeyValueDatabase {
                 let mut key = sender.as_bytes().to_vec();
                 key.push(0xFF);
                 key.extend_from_slice(ids.pushkey.as_bytes());
-                self.senderkey_pusher.remove(&key).map_err(Into::into)
+                self.senderkey_pusher.remove(&key)
             }
         }
     }
diff --git a/src/observability.rs b/src/observability.rs
index 44e06c91..0f136306 100644
--- a/src/observability.rs
+++ b/src/observability.rs
@@ -555,5 +555,5 @@ pub(crate) fn init_for_cli(
 
     let subscriber = Registry::default().with(log_layer);
 
-    tracing::subscriber::set_global_default(subscriber).map_err(Into::into)
+    tracing::subscriber::set_global_default(subscriber)
 }
diff --git a/src/service/rooms/pdu_metadata.rs b/src/service/rooms/pdu_metadata.rs
index d3854523..92e0a458 100644
--- a/src/service/rooms/pdu_metadata.rs
+++ b/src/service/rooms/pdu_metadata.rs
@@ -72,13 +72,13 @@ impl Service {
                         r.as_ref().map_or(true, |(_, pdu)| {
                             filter_event_type
                                 .as_ref()
-                                .map_or(true, |t| &&pdu.kind == t)
+                                .is_none_or(|t| &&pdu.kind == t)
                                 && if let Ok(content) = serde_json::from_str::<
                                     ExtractRelatesToEventId,
                                 >(
                                     pdu.content.get()
                                 ) {
-                                    filter_rel_type.as_ref().map_or(true, |r| {
+                                    filter_rel_type.as_ref().is_none_or(|r| {
                                         &&content.relates_to.rel_type == r
                                     })
                                 } else {
@@ -127,13 +127,13 @@ impl Service {
                         r.as_ref().map_or(true, |(_, pdu)| {
                             filter_event_type
                                 .as_ref()
-                                .map_or(true, |t| &&pdu.kind == t)
+                                .is_none_or(|t| &&pdu.kind == t)
                                 && if let Ok(content) = serde_json::from_str::<
                                     ExtractRelatesToEventId,
                                 >(
                                     pdu.content.get()
                                 ) {
-                                    filter_rel_type.as_ref().map_or(true, |r| {
+                                    filter_rel_type.as_ref().is_none_or(|r| {
                                         &&content.relates_to.rel_type == r
                                     })
                                 } else {
diff --git a/src/service/rooms/spaces.rs b/src/service/rooms/spaces.rs
index bfcbb072..d3c52b1d 100644
--- a/src/service/rooms/spaces.rs
+++ b/src/service/rooms/spaces.rs
@@ -148,7 +148,7 @@ impl Service {
                     )
                     .ok()
                     .map(|c| c.via)
-                    .map_or(true, |v| v.is_empty())
+                    .is_none_or(|v| v.is_empty())
                     {
                         continue;
                     }