diff --git a/src/core/mod.rs b/src/core/mod.rs
index 105d2dd1..ff93f719 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -1,4 +1,3 @@
-#![type_length_limit = "12288"]
 #![allow(unused_features)] // 1.96.0-nightly 2026-03-07 bug
 
 pub mod alloc;
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 50ea6823..5d799b05 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -1,4 +1,3 @@
-#![type_length_limit = "65536"]
 #![allow(unused_features)] // 1.96.0-nightly 2026-03-07 bug
 
 extern crate rust_rocksdb as rocksdb;
diff --git a/src/main/lib.rs b/src/main/lib.rs
index 392b5d50..6ead5e9b 100644
--- a/src/main/lib.rs
+++ b/src/main/lib.rs
@@ -1,4 +1,3 @@
-#![type_length_limit = "4096"] //TODO: reduce me
 #![allow(unused_features)] // 1.96.0-nightly 2026-03-07 bug
 
 pub mod args;
diff --git a/src/router/mod.rs b/src/router/mod.rs
index b21f82ea..62d83f27 100644
--- a/src/router/mod.rs
+++ b/src/router/mod.rs
@@ -1,4 +1,3 @@
-#![type_length_limit = "32768"] //TODO: reduce me
 #![allow(unused_features)] // 1.96.0-nightly 2026-03-07 bug
 
 mod handle;
diff --git a/src/service/mod.rs b/src/service/mod.rs
index ba2d92a6..0038985a 100644
--- a/src/service/mod.rs
+++ b/src/service/mod.rs
@@ -1,5 +1,3 @@
-#![recursion_limit = "256"]
-#![type_length_limit = "98304"]
 #![expect(refining_impl_trait)]
 #![allow(unused_features)] // 1.96.0-nightly 2026-03-07 bug
 
diff --git a/src/service/rooms/timeline/build.rs b/src/service/rooms/timeline/build.rs
index 48612592..392e58ac 100644
--- a/src/service/rooms/timeline/build.rs
+++ b/src/service/rooms/timeline/build.rs
@@ -120,6 +120,7 @@ pub async fn build_and_append_pdu(
 			once(pdu.event_id()),
 			state_lock,
 		)
+		.boxed()
 		.await?;
 
 	// We set the room state after inserting the pdu, so that we never have a moment
@@ -192,8 +193,8 @@ where
 						.room_members(pdu.room_id())
 						.ready_filter(|user| self.services.globals.user_is_local(user))
 						.ready_filter(|user| *user != target)
-						.boxed()
 						.count()
+						.boxed()
 						.await;
 
 					if count < 2 {
@@ -216,8 +217,8 @@ where
 						.room_members(pdu.room_id())
 						.ready_filter(|user| self.services.globals.user_is_local(user))
 						.ready_filter(|user| *user != target)
-						.boxed()
 						.count()
+						.boxed()
 						.await;
 
 					if count < 2 {