diff --git a/projects/miopen/src/include/miopen/generic_search.hpp b/projects/miopen/src/include/miopen/generic_search.hpp
index e922a23caf0..9a6b78da573 100644
--- a/projects/miopen/src/include/miopen/generic_search.hpp
+++ b/projects/miopen/src/include/miopen/generic_search.hpp
@@ -556,12 +556,9 @@ auto GenericSearch(const Solver s,
                 invoker = profile_h.PrepareInvoker(*current_solution.invoker_factory,
                                                    current_solution.construction_params);
 
-                // Warm-up run for first time invoker is used
-                if(n_current == 0)
-                {
-                    invoker(profile_h, invoke_ctx);
-                    profile_h.ResetKernelTime();
-                }
+                // Warm-up run for every configuration to eliminate cold-start bias
+                invoker(profile_h, invoke_ctx);
+                profile_h.ResetKernelTime();
 
                 invoker(profile_h, invoke_ctx);
                 elapsed_time = profile_h.GetKernelTime();