diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 9f61e59f0741a1336af6104ac0f7ab2997cb90ff..df07f580ea6c9c7c8da018525672b56b482e31eb 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -305,6 +305,7 @@ int main(int argc, char *argv[])
 	node_fini();
 	slurm_cred_ctx_destroy(slurmctld_config.cred_ctx);
 	free_slurm_conf(&slurmctld_conf);
+	slurm_api_clear_config();
 #endif
 	log_fini();
 
@@ -350,7 +351,7 @@ static void  _init_config(void)
 	slurmctld_config.thread_count_lock = 0;
 	slurmctld_config.thread_id_main    = 0;
 	slurmctld_config.thread_id_sig     = 0;
-	slurmctld_config.thread_id_rpc    = 0;
+	slurmctld_config.thread_id_rpc     = 0;
 #endif
 }
 
@@ -782,8 +783,7 @@ int slurmctld_shutdown(void)
 	/* no response */
 
 	/* shutdown message connection */
-	if ((rc = slurm_shutdown_msg_conn(sockfd))
-	    == SLURM_SOCKET_ERROR) {
+	if ((rc = slurm_shutdown_msg_conn(sockfd)) == SLURM_SOCKET_ERROR) {
 		error("slurm_shutdown_msg_conn error");
 		return SLURM_SOCKET_ERROR;
 	}