diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index 09f70a03..5c78a1c2 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -64,7 +64,12 @@ pub async fn join_room_by_id_route(
             .map(|user| user.server_name().to_owned()),
     );
 
-    servers.push(body.room_id.server_name().unwrap().into());
+    servers.push(
+        body.room_id
+            .server_name()
+            .expect("Room IDs should always have a server name")
+            .into(),
+    );
 
     join_room_by_id_helper(
         body.sender_user.as_deref(),
@@ -105,7 +110,12 @@ pub async fn join_room_by_id_or_alias_route(
                     .map(|user| user.server_name().to_owned()),
             );
 
-            servers.push(room_id.server_name().unwrap().into());
+            servers.push(
+                room_id
+                    .server_name()
+                    .expect("Room IDs should always have a server name")
+                    .into(),
+            );
 
             (servers, room_id)
         }
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index 86b3b248..600a9737 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -1620,7 +1620,7 @@ pub async fn sync_events_v4_route(
                 } else {
                     match services().rooms.state_accessor.get_avatar(room_id)? {
                         ruma::JsOption::Some(avatar) => {
-                            js_option::JsOption::Some(avatar.url.unwrap())
+                            js_option::JsOption::from_option(avatar.url)
                         }
                         ruma::JsOption::Null => ruma::JsOption::Null,
                         ruma::JsOption::Undefined => ruma::JsOption::Undefined,
diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs
index 07d576a9..b0a9ed2a 100644
--- a/src/service/rooms/spaces/mod.rs
+++ b/src/service/rooms/spaces/mod.rs
@@ -185,7 +185,9 @@ impl Service {
                     stack.push(children_ids);
                 }
             } else {
-                let server = current_room.server_name().unwrap();
+                let server = current_room
+                    .server_name()
+                    .expect("Room IDs should always have a server name");
                 if server == services().globals.server_name() {
                     continue;
                 }