diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt.py
index 61e8913df..c1adbf45e 100644
--- a/freqtrade/optimize/hyperopt.py
+++ b/freqtrade/optimize/hyperopt.py
@@ -433,7 +433,10 @@ class Hyperopt:
                                 if x not in self.opt.Xi
                                 and x not in asked_non_tried]
             i += 1
-        return asked_non_tried[:n_points]
+        if asked_non_tried:
+            return asked_non_tried[:n_points]
+        else:
+            return self.opt.ask(n_points=n_points)
 
     def start(self) -> None:
         self.random_state = self._set_random_state(self.config.get('hyperopt_random_state', None))