diff --git a/freqtrade/optimize/hyperopt/hyperopt_optimizer.py b/freqtrade/optimize/hyperopt/hyperopt_optimizer.py
index 4eda78004..213dbd074 100644
--- a/freqtrade/optimize/hyperopt/hyperopt_optimizer.py
+++ b/freqtrade/optimize/hyperopt/hyperopt_optimizer.py
@@ -222,7 +222,12 @@ class HyperOptimizer:
         """
         Assign the dimensions in the hyperoptimization space.
         """
-        for space in ["buy", "sell", "protection", "roi", "stoploss", "trailing", "trades"]:
+        spaces = ["buy", "sell", "protection", "roi", "stoploss", "trailing", "trades"]
+        spaces += [
+            s for s in self.config["spaces"] if s not in spaces and s not in ("all", "default")
+        ]
+
+        for space in spaces:
             if not HyperoptTools.has_space(self.config, space):
                 continue
             logger.debug(f"Hyperopt has '{space}' space")