diff --git a/src/lib_agnostic_baker/commands.ml b/src/lib_agnostic_baker/commands.ml
index 9d283af42f0c59e29a7aa5dcd43efcd4f4e9fe7a..08096dbf989b5fa81831dd5405e1e3fe06432e96 100644
--- a/src/lib_agnostic_baker/commands.ml
+++ b/src/lib_agnostic_baker/commands.ml
@@ -267,7 +267,11 @@ module Baker = struct
         ~verbose_rpc_error_diagnostics:false
     in
     let* parsed, _remaining =
-      C.parse_config_args full (Array.to_list Sys.argv)
+      C.parse_config_args
+        full
+        (match Array.to_list Sys.argv with
+        | _ :: original_args -> original_args
+        | [] -> [])
     in
     let parsed_config_file = parsed.Client_config.parsed_config_file in
     let parsed_args = parsed.Client_config.parsed_args in