diff --git a/conduwuit-example.toml b/conduwuit-example.toml
index 2d9e2421..de1a5b56 100644
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
@@ -256,6 +256,10 @@ allow_check_for_updates = true
 # Time in seconds before RocksDB will forcibly rotate logs. Defaults to 0.
 #rocksdb_log_time_to_roll = 0
 
+# Amount of threads that RocksDB will use for parallelism. Set to 0 to use all your CPUs.
+# Defaults to your CPU count divided by 2 (half)
+#rocksdb_parallelism_threads = 0
+
 
 
 ### Presence
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 4f154dae..2cbcf9c0 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -7,19 +7,17 @@ use std::{
 };
 
 use either::Either;
-
 use figment::Figment;
-
 use itertools::Itertools;
 use regex::RegexSet;
 use ruma::{OwnedServerName, RoomVersionId};
 use serde::{de::IgnoredAny, Deserialize};
 use tracing::{debug, error, warn};
 
-mod proxy;
-
 use self::proxy::ProxyConfig;
 
+mod proxy;
+
 #[derive(Deserialize, Clone, Debug)]
 #[serde(transparent)]
 pub struct ListeningPort {
@@ -115,6 +113,8 @@ pub struct Config {
     pub rocksdb_log_time_to_roll: usize,
     #[serde(default)]
     pub rocksdb_optimize_for_spinning_disks: bool,
+    #[serde(default = "default_rocksdb_parallelism_threads")]
+    pub rocksdb_parallelism_threads: usize,
 
     pub emergency_password: Option<String>,
 
@@ -367,6 +367,10 @@ impl fmt::Display for Config {
                 "RocksDB database optimize for spinning disks",
                 &self.rocksdb_optimize_for_spinning_disks.to_string(),
             ),
+            (
+                "RocksDB Parallelism Threads",
+                &self.rocksdb_parallelism_threads.to_string(),
+            ),
             ("Prevent Media Downloads From", {
                 let mut lst = vec![];
                 for domain in &self.prevent_media_downloads_from {
@@ -502,6 +506,10 @@ fn default_rocksdb_log_time_to_roll() -> usize {
     0
 }
 
+fn default_rocksdb_parallelism_threads() -> usize {
+    num_cpus::get() / 2
+}
+
 // I know, it's a great name
 pub(crate) fn default_default_room_version() -> RoomVersionId {
     RoomVersionId::V10
diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index 2c752a71..35fb1207 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -1,5 +1,3 @@
-use super::{super::Config, watchers::Watchers, KeyValueDatabaseEngine, KvTree};
-use crate::{utils, Result};
 use std::{
     future::Future,
     pin::Pin,
@@ -9,6 +7,10 @@ use std::{
 use rocksdb::LogLevel::{Debug, Error, Fatal, Info, Warn};
 use tracing::{debug, info};
 
+use crate::{utils, Result};
+
+use super::{super::Config, watchers::Watchers, KeyValueDatabaseEngine, KvTree};
+
 pub(crate) struct Engine {
     rocks: rocksdb::DBWithThreadMode<rocksdb::MultiThreaded>,
     cache: rocksdb::Cache,
@@ -45,16 +47,18 @@ fn db_options(rocksdb_cache: &rocksdb::Cache, config: &Config) -> rocksdb::Optio
         _ => Warn,
     };
 
+    let threads = if config.rocksdb_parallelism_threads == 0 {
+        num_cpus::get() // max CPUs if user specified 0
+    } else {
+        config.rocksdb_parallelism_threads
+    };
+
     db_opts.set_log_level(rocksdb_log_level);
     db_opts.set_max_log_file_size(config.rocksdb_max_log_file_size);
     db_opts.set_log_file_time_to_roll(config.rocksdb_log_time_to_roll);
 
     if config.rocksdb_optimize_for_spinning_disks {
-        // useful for hard drives but on literally any half-decent SSD this is not useful
-        // and the benefits of improved compaction based on up to date stats are good.
-        // current conduwut users have NVMe/SSDs.
         db_opts.set_skip_stats_update_on_db_open(true);
-
         db_opts.set_compaction_readahead_size(2 * 1024 * 1024); // default compaction_readahead_size is 0 which is good for SSDs
         db_opts.set_target_file_size_base(256 * 1024 * 1024); // default target_file_size is 64MB which is good for SSDs
         db_opts.set_optimize_filters_for_hits(true); // doesn't really seem useful for fast storage
@@ -70,7 +74,11 @@ fn db_options(rocksdb_cache: &rocksdb::Cache, config: &Config) -> rocksdb::Optio
     db_opts.set_block_based_table_factory(&block_based_options);
     db_opts.set_level_compaction_dynamic_level_bytes(true);
     db_opts.create_if_missing(true);
-    db_opts.increase_parallelism(num_cpus::get().try_into().unwrap_or_default());
+    db_opts.increase_parallelism(
+        threads
+            .try_into()
+            .expect("Failed to convert \"rocksdb_parallelism_threads\" usize into i32"),
+    );
     //db_opts.set_max_open_files(config.rocksdb_max_open_files);
     db_opts.set_compression_type(rocksdb::DBCompressionType::Zstd);
     db_opts.set_compaction_style(rocksdb::DBCompactionStyle::Level);
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index e3341314..019c2944 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -463,6 +463,10 @@ impl Service<'_> {
         self.config.rocksdb_optimize_for_spinning_disks
     }
 
+    pub fn rocksdb_parallelism_threads(&self) -> usize {
+        self.config.rocksdb_parallelism_threads
+    }
+
     pub fn prevent_media_downloads_from(&self) -> &[OwnedServerName] {
         &self.config.prevent_media_downloads_from
     }