diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt.py
index bbdc8bf27..f08fa7233 100644
--- a/freqtrade/optimize/hyperopt.py
+++ b/freqtrade/optimize/hyperopt.py
@@ -430,6 +430,7 @@ class Hyperopt:
         asked_non_tried: List[List[Any]] = []
         while i < 100 and len(asked_non_tried) < n_points:
             if i < 3:
+                self.opt.cache_ = {}
                 asked = self.opt.ask(n_points=n_points)
             else:
                 asked = self.opt.space.rvs(n_samples=n_points * 5)
@@ -438,7 +439,7 @@ class Hyperopt:
                                 and x not in asked_non_tried]
             i += 1
         if asked_non_tried:
-            return asked_non_tried[:n_points]
+            return asked_non_tried[:min(len(asked_non_tried), n_points)]
         else:
             return self.opt.ask(n_points=n_points)