diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index c2f2f38b1a..e5e712779c 100644
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -61,7 +61,7 @@ const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name)
 }
 
 const struct doveadm_cmd_ver2 *
-doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *argv[])
+doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *const argv[])
 {
 	int i;
 	const struct doveadm_cmd_ver2 *cmd;
diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 13570769ea..c20c9034d7 100644
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -117,7 +117,7 @@ void doveadm_cmd_ver2_to_mail_cmd_wrapper(const struct doveadm_cmd_ver2* cmd,
 
 void doveadm_cmd_register_ver2(struct doveadm_cmd_ver2 *cmd);
 const struct doveadm_cmd_ver2 *
-doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *argv[]);
+doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *const argv[]);
 const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name);
 /* Returns FALSE if cmd_name doesn't exist, TRUE if it exists. */
 bool doveadm_cmd_try_run_ver2(const char *cmd_name,
diff --git a/src/doveadm/doveadm-mail-batch.c b/src/doveadm/doveadm-mail-batch.c
index c8b800afd8..d27e86837b 100644
--- a/src/doveadm/doveadm-mail-batch.c
+++ b/src/doveadm/doveadm-mail-batch.c
@@ -60,7 +60,7 @@ cmd_batch_add(struct batch_cmd_context *batchctx,
 	const char *getopt_args;
 	int c;
 
-	cmd_ver2 = doveadm_cmd_find_with_args_ver2(argv[0], argc, (const char**)&argv);
+	cmd_ver2 = doveadm_cmd_find_with_args_ver2(argv[0], argc, argv);
 
 	if (cmd_ver2 == NULL)
 		cmd = doveadm_mail_cmd_find_from_argv(argv[0], &argc, &argv);