diff --git a/Cargo.toml b/Cargo.toml
index cb2ab916..cffbebfa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -242,6 +242,7 @@ features = [
 	"time",
 	"rt-multi-thread",
 	"io-util",
+	"tracing",
 ]
 
 [workspace.dependencies.tokio-metrics]
diff --git a/src/database/pool.rs b/src/database/pool.rs
index e4d78897..65012527 100644
--- a/src/database/pool.rs
+++ b/src/database/pool.rs
@@ -122,8 +122,16 @@ async fn spawn_until(self: &Arc<Self>, recv: Receiver<Cmd>, max: usize) -> Resul
 fn spawn_one(self: &Arc<Self>, workers: &mut JoinSet<()>, recv: Receiver<Cmd>) -> Result {
 	let id = workers.len();
 	let self_ = self.clone();
+
+	#[cfg(not(tokio_unstable))]
 	let _abort = workers.spawn_blocking_on(move || self_.worker(id, recv), self.server.runtime());
 
+	#[cfg(tokio_unstable)]
+	let _abort = workers
+		.build_task()
+		.name("conduwuit:dbpool")
+		.spawn_blocking_on(move || self_.worker(id, recv), self.server.runtime());
+
 	Ok(())
 }