diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt.py
index ee3f4d2c4..6b334507a 100644
--- a/freqtrade/optimize/hyperopt.py
+++ b/freqtrade/optimize/hyperopt.py
@@ -557,7 +557,7 @@ class Hyperopt:
         cpus = cpu_count()
         logger.info(f"Found {cpus} CPU cores. Let's make them scream!")
         config_jobs = self.config.get('hyperopt_jobs', -1)
-        if self.total_epochs < cpus:
+        if self.total_epochs < cpus and (config_jobs > self.total_epochs or config_jobs < 0):
             config_jobs = self.total_epochs
         logger.info(f'Number of parallel jobs set as: {config_jobs}')