diff --git a/python/revng/cli/_commands/daemon.py b/python/revng/cli/_commands/daemon.py
index 6c60891bd..706f40d6a 100644
--- a/python/revng/cli/_commands/daemon.py
+++ b/python/revng/cli/_commands/daemon.py
@@ -67,7 +67,7 @@ REVNG_DATA_DIR and REVNG_PROJECT_ID set: use '$REVNG_DATA_DIR/$REVNG_PROJECT_ID'
         prefix = handle_asan(dependencies, options.search_prefixes)
 
         env = {**os.environ}
-        args = ["--no-access-log", "--workers", "1"]
+        args = ["--no-access-log", "--workers", "1", "--timeout-keep-alive", "600"]
         extra_args = shlex.split(options.parsed_args.uvicorn_args)
 
         host = "127.0.0.1"
diff --git a/python/revng/cli/_commands/daemon_self_test.py b/python/revng/cli/_commands/daemon_self_test.py
index f91c96e0c..600cea8dc 100755
--- a/python/revng/cli/_commands/daemon_self_test.py
+++ b/python/revng/cli/_commands/daemon_self_test.py
@@ -54,7 +54,7 @@ class DaemonSelfTestCommand(Command):
             temp_folder = TemporaryDirectory()
             self.url = f"unix:{temp_folder.name}/daemon.sock"
             self.process = Popen(
-                ["revng", "daemon", "--uvicorn-args", "--timeout-keep-alive 600", "-b", self.url],
+                ["revng", "daemon", "-b", self.url],
                 env={k: v for k, v in os.environ.items() if k not in self.FILTER_ENV},
                 stdout=PIPE,
                 stderr=STDOUT,
diff --git a/share/revng/test/tests/daemon/test.py b/share/revng/test/tests/daemon/test.py
index 80d49771c..49a1b42f6 100755
--- a/share/revng/test/tests/daemon/test.py
+++ b/share/revng/test/tests/daemon/test.py
@@ -83,8 +83,6 @@ async def client(pytestconfig: Config, request) -> AsyncGenerator[AsyncClientSes
         [
             "revng",
             "daemon",
-            "--uvicorn-args",
-            "--timeout-keep-alive 600",
             "-b",
             f"unix:{socket_path}",
         ],