diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8955ac8..8a96d48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [2.2.36] - 2024-04-14
+
+- Set max threads
+
 # [2.2.35] - 2024-04-14
 
 - Remove limit threads feature calc
diff --git a/deeplc/deeplc.py b/deeplc/deeplc.py
index 8407691..8bc441b 100644
--- a/deeplc/deeplc.py
+++ b/deeplc/deeplc.py
@@ -241,6 +241,10 @@ def __init__(
         self.split_cal = split_cal
         self.n_jobs = n_jobs
 
+        if self.n_jobs == None:
+            max_threads = multiprocessing.cpu_count()
+            self.n_jobs = max_threads
+
         self.use_library = use_library
         self.write_library = write_library
 
diff --git a/pyproject.toml b/pyproject.toml
index 6ce0677..376f827 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "deeplc"
-version = "2.2.35"
+version = "2.2.36"
 description = "DeepLC: Retention time prediction for (modified) peptides using Deep Learning."
 readme = "README.md"
 license = { file = "LICENSE" }