diff --git a/cfg.c b/cfg.c
index 93d0f8f6..f98d5f0b 100644
--- a/cfg.c
+++ b/cfg.c
@@ -43,6 +43,8 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data)
 	if (!RB_EMPTY(&sessions))
 		cfg_show_causes(RB_MIN(sessions, &sessions));
 
+	status_prompt_load_history();
+
 	return (CMD_RETURN_NORMAL);
 }
 
diff --git a/server.c b/server.c
index 70f1a76f..71c0e25a 100644
--- a/server.c
+++ b/server.c
@@ -176,8 +176,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 
 	start_cfg();
 
-	status_prompt_load_history();
-
 	server_add_accept(0);
 
 	proc_loop(server_proc, server_loop);