diff --git a/eval.py b/eval.py
index 642a8071242096ef4e3278d3b02c962662d00cdb..79850fc662e7b78d6186a8105b24e7a76e8ba5cd 100755
--- a/eval.py
+++ b/eval.py
@@ -333,6 +333,7 @@ CLIENT_DIR = ROOT_DIR / 'emper-client'
 CLIENT_ENV = {}
 CLIENT_EXE = f'{CLIENT_DIR}/build/apps/echoclient'
 
+CLIENT_TIMEOUT_FACTOR = 3
 CLIENT_TIMEOUT = 1800
 
 ARG_PREFIX = '{cons}.{size}.{run}'
@@ -786,11 +787,13 @@ if __name__ == '__main__':
 
     if args.time:
         TERMINATION_FLAG = f'-t {args.time}'
+        CLIENT_TIMEOUT = int(args.time) * CLIENT_TIMEOUT_FACTOR
     elif args.iterations:
         TERMINATION_FLAG = f'-i {args.iterations}'
     else:
         # the default termination condition are 60 seconds
         TERMINATION_FLAG = '-t 60'
+        CLIENT_TIMEOUT = 60 * CLIENT_TIMEOUT_FACTOR
 
     CLIENT_CMD = (
         f'{CLIENT_EXE} -c {{cons}} -s {{size}} {TERMINATION_FLAG}'