diff --git a/DEPLOY.md b/DEPLOY.md
index 02073ff6..c48b7780 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -99,7 +99,7 @@ allow_federation = true
 trusted_servers = ["matrix.org"]
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
-#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #workers = 4 # default: cpu core count * 2
 
 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
diff --git a/conduit-example.toml b/conduit-example.toml
index 3ac3a485..66c105be 100644
--- a/conduit-example.toml
+++ b/conduit-example.toml
@@ -36,7 +36,7 @@ max_request_size = 20_000_000 # in bytes
 trusted_servers = ["matrix.org"]
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
-#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
 #workers = 4 # default: cpu core count * 2
 
diff --git a/debian/postinst b/debian/postinst
index c3d727c1..6a4cdb8a 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -74,7 +74,7 @@ max_request_size = 20_000_000 # in bytes
 #allow_jaeger = false
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
-#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
 #workers = 4 # default: cpu core count * 2
 EOF
diff --git a/src/database.rs b/src/database.rs
index 76eae244..561b5612 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -67,7 +67,7 @@ fn default_max_request_size() -> u32 {
 }
 
 fn default_max_concurrent_requests() -> u16 {
-    4
+    100
 }
 
 fn default_log() -> String {
diff --git a/src/main.rs b/src/main.rs
index 7257d698..fc61a0b0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -212,8 +212,8 @@ async fn main() {
         let rocket = setup_rocket(raw_config, db);
         rocket.launch().await.unwrap();
     } else {
-        std::env::set_var("CONDUIT_LOG", config.log);
-        pretty_env_logger::init_custom_env("CONDUIT_LOG");
+        std::env::set_var("RUST_LOG", config.log);
+        tracing_subscriber::fmt::init();
 
         let rocket = setup_rocket(raw_config, db);
         rocket.launch().await.unwrap();