diff --git a/bench/emper.py b/bench/emper.py
index 3b863994c7ce6969b48af5fca9038d9765f5d230..75a6d829ba627f97f7b01c305457e98d90c73197 100644
--- a/bench/emper.py
+++ b/bench/emper.py
@@ -696,7 +696,8 @@ def build_emper(emper_dir, meson_options='', build_env=None):
     build_env.update({'CFLAGS': '-g', 'CXXFLAGS': '-g'})
     meson_env = prepare_env(build_env)
 
-    common_options = '-Dstats=true --buildtype=release --fatal-meson-warnings'
+    stats_options = '-Dstats=true -Dstats_all=true -Dstats_stack_usage=disabled'
+    common_options = f'{stats_options} --buildtype=release --fatal-meson-warnings'
     build_cmd = f'meson build {common_options} {meson_options}'
 
     cmd_run(build_cmd, log, cwd=emper_dir, env=meson_env)
@@ -711,8 +712,10 @@ def get_commit_id(repo=REPO, commit_ish='HEAD') -> str:
     return subprocess.check_output(cmd.split(), cwd=repo, text=True)[:-1]
 
 
-def prepare_client(data_dir: Path):
+def prepare_client(data_dir: Path, fetch=True):
     """Prepare and build the special emper variant for the client"""
+    if fetch:
+        repo_fetch()
     client_checkout = get_commit_id(REPO, CLIENT_CHECKOUT)
 
     with open(data_dir / 'desc.yml', 'a', encoding='utf-8') as desc_file:
diff --git a/eval.py b/eval.py
index cb3202380e34117ec075180b4b0281c287c6fa06..f4dea7fa98e9aa02106a54c5ab72028e924b23e6 100755
--- a/eval.py
+++ b/eval.py
@@ -420,7 +420,7 @@ if __name__ == '__main__':
     write_desc(DATA_DIR)
 
     if args.client_impl == 'emper':
-        emper.prepare_client(DATA_DIR)
+        emper.prepare_client(DATA_DIR, fetch=not args.no_fetch)
 
     # generate selected emper flavors
     if 'emper' in args.implementations: