diff --git a/ChangeLog.txt b/ChangeLog.txt
index 509cd72c04..fc443ff10a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,9 @@ Broker:
 - Add notes that libsystemd-dev or similar is needed if building with systemd
   support. Closes #2019.
 
+Apps:
+- Allow command line arguments to override config file options in
+  mosquitto_ctrl. Closes #2010.
 
 2.0.5 - 2021-01-11
 ==================
diff --git a/apps/mosquitto_ctrl/options.c b/apps/mosquitto_ctrl/options.c
index 8d8d3bc98b..20e4d2fb09 100644
--- a/apps/mosquitto_ctrl/options.c
+++ b/apps/mosquitto_ctrl/options.c
@@ -89,11 +89,11 @@ int ctrl_config_parse(struct mosq_config *cfg, int *argc, char **argv[])
 
 	init_config(cfg);
 
-	/* Deal with real argc/argv */
-	rc = client_config_line_proc(cfg, argc, argv);
+	rc = client_config_load(cfg);
 	if(rc) return rc;
 
-	rc = client_config_load(cfg);
+	/* Deal with real argc/argv */
+	rc = client_config_line_proc(cfg, argc, argv);
 	if(rc) return rc;
 
 #ifdef WITH_TLS