diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index 5e675297..490a947b 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -1618,7 +1618,7 @@ pub async fn sync_events_v4_route(
                     .rooms
                     .state_accessor
                     .get_name(room_id)?
-                    .or_else(|| name),
+                    .or(name),
                 avatar: if let Some(avatar) = avatar {
                     ruma::JsOption::Some(avatar)
                 } else {
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index e7db6f78..375d1ff0 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -966,14 +966,21 @@ impl Service {
 
         debug!("Resolving state");
 
-        let lock = services().globals.stateres_mutex.lock();
-        let state = match state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
+        let fetch_event = |id: &_| {
             let res = services().rooms.timeline.get_pdu(id);
             if let Err(e) = &res {
                 error!("LOOK AT ME Failed to fetch event: {}", e);
             }
             res.ok().flatten()
-        }) {
+        };
+
+        let lock = services().globals.stateres_mutex.lock();
+        let state = match state_res::resolve(
+            room_version_id,
+            &fork_states,
+            auth_chain_sets,
+            fetch_event,
+        ) {
             Ok(new_state) => new_state,
             Err(_) => {
                 return Err(Error::bad_database("State resolution failed, either an event could not be found or deserialization"));
diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs
index 0e84221f..90523667 100644
--- a/src/service/rooms/spaces/mod.rs
+++ b/src/service/rooms/spaces/mod.rs
@@ -133,8 +133,7 @@ impl Service {
                         .ok_or_else(|| Error::bad_database("Event in space state not found"))?;
 
                     if serde_json::from_str::<SpaceChildEventContent>(pdu.content.get())
-                        .ok()
-                        .and_then(|c| Some(c.via))
+                        .ok().map(|c| c.via)
                         .map_or(true, |v| v.is_empty())
                     {
                         continue;