diff --git a/zebrad/src/components/tokio.rs b/zebrad/src/components/tokio.rs
index 386c0bf2..c0dc22d0 100644
--- a/zebrad/src/components/tokio.rs
+++ b/zebrad/src/components/tokio.rs
@@ -21,7 +21,13 @@ pub struct TokioComponent {
 impl TokioComponent {
     pub fn new() -> Result<Self, FrameworkError> {
         Ok(Self {
-            rt: Some(Runtime::new().unwrap()),
+            rt: Some(
+                tokio::runtime::Builder::new()
+                    .enable_all()
+                    .threaded_scheduler()
+                    .build()
+                    .unwrap(),
+            ),
         })
     }
 }