diff --git a/matrix_sdk/src/event_handler/mod.rs b/matrix_sdk/src/event_handler/mod.rs
index 5b21b0a7..e7cf2105 100644
--- a/matrix_sdk/src/event_handler/mod.rs
+++ b/matrix_sdk/src/event_handler/mod.rs
@@ -14,6 +14,7 @@
 // limitations under the License.
 use std::ops::Deref;
 
+use matrix_sdk_base::{hoist_and_deserialize_state_event, hoist_room_event_prev_content};
 use matrix_sdk_common::async_trait;
 use ruma::{
     api::client::r0::push::get_notifications::Notification,
@@ -91,7 +92,7 @@ impl Handler {
                 }
 
                 for (raw_event, event) in room_info.state.events.iter().filter_map(|e| {
-                    if let Ok(d) = e.deserialize() {
+                    if let Ok(d) = hoist_and_deserialize_state_event(e) {
                         Some((e, d))
                     } else {
                         None
@@ -101,7 +102,7 @@ impl Handler {
                 }
 
                 for (raw_event, event) in room_info.timeline.events.iter().filter_map(|e| {
-                    if let Ok(d) = e.event.deserialize() {
+                    if let Ok(d) = hoist_room_event_prev_content(&e.event) {
                         Some((&e.event, d))
                     } else {
                         None
@@ -121,7 +122,7 @@ impl Handler {
                 }
 
                 for (raw_event, event) in room_info.state.events.iter().filter_map(|e| {
-                    if let Ok(d) = e.deserialize() {
+                    if let Ok(d) = hoist_and_deserialize_state_event(e) {
                         Some((e, d))
                     } else {
                         None
@@ -131,7 +132,7 @@ impl Handler {
                 }
 
                 for (raw_event, event) in room_info.timeline.events.iter().filter_map(|e| {
-                    if let Ok(d) = e.event.deserialize() {
+                    if let Ok(d) = hoist_room_event_prev_content(&e.event) {
                         Some((&e.event, d))
                     } else {
                         None
diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index b36d9041..7c7497ea 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -129,7 +129,7 @@ fn hoist_member_event(
     Ok(e)
 }
 
-fn hoist_room_event_prev_content(
+pub fn hoist_room_event_prev_content(
     event: &Raw<AnySyncRoomEvent>,
 ) -> StdResult<AnySyncRoomEvent, serde_json::Error> {
     let prev_content = event
diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs
index 326700ce..051f2181 100644
--- a/matrix_sdk_base/src/lib.rs
+++ b/matrix_sdk_base/src/lib.rs
@@ -50,7 +50,9 @@ mod rooms;
 mod session;
 mod store;
 
-pub use client::{BaseClient, BaseClientConfig};
+pub use client::{
+    hoist_and_deserialize_state_event, hoist_room_event_prev_content, BaseClient, BaseClientConfig,
+};
 #[cfg(feature = "encryption")]
 #[cfg_attr(feature = "docs", doc(cfg(encryption)))]
 pub use matrix_sdk_crypto as crypto;