diff --git a/Cargo.lock b/Cargo.lock
index caaf8f21459673..e7409cd037a37c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7508,6 +7508,7 @@ dependencies = [
  "solana-perf",
  "solana-poh",
  "solana-program-runtime",
+ "solana-rayon-threadlimit",
  "solana-rpc",
  "solana-rpc-client",
  "solana-rpc-client-api",
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index dd8246fafd3c6e..6e4991736a8f8f 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -50,6 +50,7 @@ solana-net-utils = { workspace = true }
 solana-perf = { workspace = true }
 solana-poh = { workspace = true }
 solana-program-runtime = { workspace = true }
+solana-rayon-threadlimit = { workspace = true }
 solana-rpc = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-rpc-client-api = { workspace = true }
diff --git a/validator/src/main.rs b/validator/src/main.rs
index ad89bc4886d4ed..fd55bf74d20dde 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -1382,11 +1382,9 @@ pub fn main() {
                 usize
             ),
             worker_threads: value_t_or_exit!(matches, "rpc_pubsub_worker_threads", usize),
-            notification_threads: if full_api {
-                value_of(&matches, "rpc_pubsub_notification_threads")
-            } else {
-                Some(0)
-            },
+            notification_threads: value_t!(matches, "rpc_pubsub_notification_threads", usize)
+                .ok()
+                .and_then(NonZeroUsize::new),
         },
         voting_disabled: matches.is_present("no_voting") || restricted_repair_only_mode,
         wait_for_supermajority: value_t!(matches, "wait_for_supermajority", Slot).ok(),