diff --git a/Cargo.toml b/Cargo.toml
index 3e67b035..9e44adab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -387,6 +387,7 @@ features = [
     "unstable-msc4210", # remove legacy mentions
     "unstable-extensible-events",
     "unstable-pdu",
+	"unstable-msc4155"
 ]
 
 [workspace.dependencies.rust-rocksdb]
diff --git a/src/core/matrix/pdu.rs b/src/core/matrix/pdu.rs
index 7d4ac3ce..c7fb0d65 100644
--- a/src/core/matrix/pdu.rs
+++ b/src/core/matrix/pdu.rs
@@ -31,6 +31,7 @@ use crate::Result;
 pub struct Pdu {
 	pub event_id: OwnedEventId,
 
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub room_id: Option<OwnedRoomId>,
 
 	pub sender: OwnedUserId,
diff --git a/src/service/rooms/timeline/backfill.rs b/src/service/rooms/timeline/backfill.rs
index 603b277e..77014c32 100644
--- a/src/service/rooms/timeline/backfill.rs
+++ b/src/service/rooms/timeline/backfill.rs
@@ -7,7 +7,6 @@ use conduwuit_core::{
 		event::Event,
 		pdu::{PduCount, PduId, RawPduId},
 	},
-	trace,
 	utils::{IterStream, ReadyExt},
 	validated, warn,
 };