diff --git a/bindings/matrix-sdk-ffi/src/room.rs b/bindings/matrix-sdk-ffi/src/room.rs
index e3924fd41..eb1cd497f 100644
--- a/bindings/matrix-sdk-ffi/src/room.rs
+++ b/bindings/matrix-sdk-ffi/src/room.rs
@@ -263,10 +263,10 @@ impl Room {
         Arc::new(TaskHandle::new(RUNTIME.spawn(async move {
             let (initial, mut subscriber) = self.inner.notable_tags_stream().await;
             // Send the initial value
-            listener.call(initial.into());
+            listener.call(initial);
             // Then wait for changes
             while let Some(notable_tags) = subscriber.next().await {
-                listener.call(notable_tags.into());
+                listener.call(notable_tags);
             }
         })))
     }
diff --git a/crates/matrix-sdk-base/src/client.rs b/crates/matrix-sdk-base/src/client.rs
index 8b603f541..558a0d11a 100644
--- a/crates/matrix-sdk-base/src/client.rs
+++ b/crates/matrix-sdk-base/src/client.rs
@@ -979,14 +979,16 @@ impl BaseClient {
 
         for (room_id, room_account_data) in &changes.room_account_data {
             if let Some(room) = self.store.get_room(room_id) {
-                let tags = if let Some(AnyRoomAccountDataEvent::Tag(event)) = room_account_data
-                    .get(&RoomAccountDataEventType::Tag)
-                    .and_then(|r| r.deserialize().ok())
-                {
-                    Some(event.content.tags)
-                } else {
-                    None
-                };
+                let tags = room_account_data.get(&RoomAccountDataEventType::Tag).and_then(|r| {
+                    match r.deserialize() {
+                        Ok(AnyRoomAccountDataEvent::Tag(event)) => Some(event.content.tags),
+                        Err(e) => {
+                            warn!("Room account data tag event failed to deserialize : {e}");
+                            None
+                        }
+                        Ok(_) => None,
+                    }
+                });
                 let notable_tags = RoomNotableTags::new(tags);
                 room.set_notable_tags(notable_tags)
             }
diff --git a/crates/matrix-sdk-base/src/rooms/normal.rs b/crates/matrix-sdk-base/src/rooms/normal.rs
index 91804544c..eca133583 100644
--- a/crates/matrix-sdk-base/src/rooms/normal.rs
+++ b/crates/matrix-sdk-base/src/rooms/normal.rs
@@ -652,9 +652,13 @@ impl Room {
     pub fn set_notable_tags(&self, notable_tags: RoomNotableTags) {
         self.notable_tags.set(notable_tags);
     }
+
     /// Returns the current RoomNotableTags and subscribe to changes.
     pub async fn notable_tags_stream(&self) -> (RoomNotableTags, Subscriber<RoomNotableTags>) {
-        let current_tags = self.tags().await.unwrap_or(None);
+        let current_tags = self.tags().await.unwrap_or_else(|e| {
+            warn!("Failed to get tags from store: {}", e);
+            None
+        });
         (RoomNotableTags::new(current_tags), self.notable_tags.subscribe())
     }
 
@@ -840,7 +844,7 @@ impl RoomNotableTags {
     /// Computes the provided tags to create a `RoomNotableTags` instance.
     pub fn new(tags: Option<Tags>) -> Self {
         RoomNotableTags {
-            is_favorite: tags.map(|tag| tag.contains_key(&TagName::Favorite)).unwrap_or(false),
+            is_favorite: tags.map_or(false, |tag| tag.contains_key(&TagName::Favorite)),
         }
     }
 }
@@ -1468,9 +1472,12 @@ mod tests {
     async fn when_set_notable_tags_is_called_then_notable_tags_subscriber_is_updated() {
         let (_, room) = make_room(RoomState::Joined);
         let (_, mut notable_tags_subscriber) = room.notable_tags_stream().await;
+
         stream_assert::assert_pending!(notable_tags_subscriber);
+
         let notable_tags = RoomNotableTags::new(None);
         room.set_notable_tags(notable_tags);
+
         use futures_util::FutureExt as _;
         assert!(notable_tags_subscriber.next().now_or_never().is_some());
         stream_assert::assert_pending!(notable_tags_subscriber);
@@ -1493,11 +1500,14 @@ mod tests {
     async fn when_tags_are_inserted_in_room_account_data_then_initial_notable_tags_is_updated() {
         let (store, room) = make_room(RoomState::Joined);
         let mut changes = StateChanges::new("".to_owned());
+
         let tag_json: &Value = &test_json::TAG;
         let tag_raw = Raw::new(tag_json).unwrap().cast();
         let tag_event = tag_raw.deserialize().unwrap();
         changes.add_room_account_data(room.room_id(), tag_event, tag_raw);
+
         store.save_changes(&changes).await.unwrap();
+
         let (initial_notable_tags, _) = room.notable_tags_stream().await;
         assert!(initial_notable_tags.is_favorite);
     }