diff --git a/pkg/suggestion/v1beta1/hyperopt/base_service.py b/pkg/suggestion/v1beta1/hyperopt/base_service.py
index 0d65ecd77e0..5eb70c62d98 100644
--- a/pkg/suggestion/v1beta1/hyperopt/base_service.py
+++ b/pkg/suggestion/v1beta1/hyperopt/base_service.py
@@ -93,34 +93,34 @@ def create_hyperopt_domain(self):
                             param.name, float(param.min), float(param.max)
                         )
                 elif param.distribution == api_pb2.NORMAL:
-                    sigma = 1
+                    sigma = max(float(param.min), float(param.max))
                     if param.step:
                         hyperopt_search_space[param.name] = hyperopt.hp.qnormal(
                             param.name,
                             float((float(param.min) + float(param.max)) / 2),
-                            float(sigma),
+                            sigma,
                             float(param.step),
                         )
                     else:
                         hyperopt_search_space[param.name] = hyperopt.hp.normal(
                             param.name,
                             float((float(param.min) + float(param.max)) / 2),
-                            float(sigma),
+                            sigma,
                         )
                 elif param.distribution == api_pb2.LOG_NORMAL:
-                    sigma = 1
+                    sigma = max(float(param.min), float(param.max))
                     if param.step:
                         hyperopt_search_space[param.name] = hyperopt.hp.qlognormal(
                             param.name,
                             float((float(param.min) + float(param.max)) / 2),
-                            float(sigma),
+                            sigma,
                             float(param.step),
                         )
                     else:
                         hyperopt_search_space[param.name] = hyperopt.hp.lognormal(
                             param.name,
                             float((float(param.min) + float(param.max)) / 2),
-                            float(sigma),
+                            sigma,
                         )
             elif param.type == CATEGORICAL or param.type == DISCRETE:
                 hyperopt_search_space[param.name] = hyperopt.hp.choice(