diff --git a/vectordb_bench/backend/clients/pgvector/cli.py b/vectordb_bench/backend/clients/pgvector/cli.py
index bf94a727..ce98806a 100644
--- a/vectordb_bench/backend/clients/pgvector/cli.py
+++ b/vectordb_bench/backend/clients/pgvector/cli.py
@@ -18,11 +18,12 @@
 from vectordb_bench.backend.clients import DB
 
 
-
 def set_default_quantized_fetch_limit(ctx, param, value):
     if ctx.params.get("reranking") and value is None:
         # ef_search is the default value for quantized_fetch_limit as it's bound by ef_search.
-        return ctx.params["ef_search"] 
+        # 100 (arbitrary) is default value for quantized_fetch_limit for IVFFlat.
+        default_value = ctx.params["ef_search"] if ctx.command.name == "pgvectorhnsw" else 100
+        return default_value
     return value
 
 class PgVectorTypedDict(CommonTypedDict):
diff --git a/vectordb_bench/cli/cli.py b/vectordb_bench/cli/cli.py
index 44c13400..e5b9a5fe 100644
--- a/vectordb_bench/cli/cli.py
+++ b/vectordb_bench/cli/cli.py
@@ -414,7 +414,7 @@ class HNSWBaseRequiredTypedDict(TypedDict):
 
 class HNSWFlavor1(HNSWBaseTypedDict):
     ef_search: Annotated[
-        Optional[int], click.option("--ef-search", type=int, help="hnsw ef-search")
+        Optional[int], click.option("--ef-search", type=int, help="hnsw ef-search", is_eager=True)
     ]