diff --git a/main/config.c b/main/config.c
index 59d5163342..4766d2efb5 100644
--- a/main/config.c
+++ b/main/config.c
@@ -3378,6 +3378,8 @@ static void config_shutdown(void)
 
 	ast_cli_unregister_multiple(cli_config, ARRAY_LEN(cli_config));
 
+	clear_config_maps();
+
 	ao2_cleanup(cfg_hooks);
 	cfg_hooks = NULL;
 }