diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml
index 484379ea8a2..0129f90519b 100644
--- a/crates/matrix-sdk-base/Cargo.toml
+++ b/crates/matrix-sdk-base/Cargo.toml
@@ -64,7 +64,7 @@ wasm-bindgen = { version = "0.2.74", features = ["serde-serialize"], optional =
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma/"
 rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"
-features = ["client-api-c"]
+features = ["client-api-c", "unstable-pre-spec"]
 
 [dev-dependencies]
 futures = { version = "0.3.15", default-features = false, features = ["executor"] }
diff --git a/crates/matrix-sdk-base/src/rooms/mod.rs b/crates/matrix-sdk-base/src/rooms/mod.rs
index f766f5801f7..819aa93fd9a 100644
--- a/crates/matrix-sdk-base/src/rooms/mod.rs
+++ b/crates/matrix-sdk-base/src/rooms/mod.rs
@@ -79,7 +79,7 @@ impl BaseRoomInfo {
                 true
             }
             AnyStateEventContent::RoomAvatar(a) => {
-                self.avatar_url = Some(a.url.clone());
+                self.avatar_url = a.url.clone();
                 true
             }
             AnyStateEventContent::RoomName(n) => {
diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml
index aafcd3357d1..98497eb2b29 100644
--- a/crates/matrix-sdk/Cargo.toml
+++ b/crates/matrix-sdk/Cargo.toml
@@ -101,7 +101,7 @@ default_features = false
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma/"
 rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"
-features = ["client-api-c", "compat", "rand", "unstable-msc2448"]
+features = ["client-api-c", "compat", "rand", "unstable-msc2448", "unstable-pre-spec"]
 
 [dependencies.tokio-stream]
 version = "0.1.6"