diff --git a/main/aoc.c b/main/aoc.c
index 79978b1a5a16f315df0f57e2e9bcc325ad4f3403..8a51509258887313217af5448f655cd8322d7980 100644
--- a/main/aoc.c
+++ b/main/aoc.c
@@ -1605,7 +1605,12 @@ static struct ast_cli_entry aoc_cli[] = {
 	AST_CLI_DEFINE(aoc_cli_debug_enable, "enable cli debugging of AOC messages"),
 };
 
+static void aoc_shutdown(void)
+{
+	ast_cli_unregister_multiple(aoc_cli, ARRAY_LEN(aoc_cli));
+}
 int ast_aoc_cli_init(void)
 {
+	ast_register_atexit(aoc_shutdown);
 	return ast_cli_register_multiple(aoc_cli, ARRAY_LEN(aoc_cli));
 }
diff --git a/main/cel.c b/main/cel.c
index 6af617478050bfa257fe103b3d3a88f7981a6cdc..85e2967322eda5320e9f38d2ad2fce975dd60d9e 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -729,6 +729,7 @@ static void ast_cel_engine_term(void)
 		ao2_ref(linkedids, -1);
 		linkedids = NULL;
 	}
+	ast_cli_unregister(&cli_status);
 }
 
 int ast_cel_engine_init(void)
diff --git a/main/channel.c b/main/channel.c
index 37fda09f1b52170c828ff3aa10f53e4630a6e3a5..ce3a58ffdd16a563bc948dd3fd7880aeb6247eeb 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -8620,9 +8620,11 @@ static void prnt_channel_key(void *v_obj, void *where, ao2_prnt_fn *prnt)
 static void channels_shutdown(void)
 {
 	ast_data_unregister(NULL);
+	ast_cli_unregister_multiple(cli_channel, ARRAY_LEN(cli_channel));
 	if (channels) {
 		ao2_container_unregister("channels");
 		ao2_ref(channels, -1);
+		channels = NULL;
 	}
 }
 
diff --git a/main/data.c b/main/data.c
index 7a19b1f8f74d730f6599b9ecaf2791c87423e4c4..44ba390ad258b7573f7edb0406e912e0d494c2d7 100644
--- a/main/data.c
+++ b/main/data.c
@@ -3318,7 +3318,9 @@ AST_TEST_DEFINE(test_data_get)
 static void data_shutdown(void)
 {
 	ast_manager_unregister("DataGet");
+	ast_cli_unregister_multiple(cli_data, ARRAY_LEN(cli_data));
 	ao2_t_ref(root_data.container, -1, "Unref root_data.container in data_shutdown");
+	root_data.container = NULL;
 	ast_rwlock_destroy(&root_data.lock);
 }
 
diff --git a/main/file.c b/main/file.c
index 915ed98d6f5394e0772f3bc70a529b53d5d7a312..db8fd5c02d2139477bd7bd5c71b511e97789c424 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1583,8 +1583,14 @@ static struct ast_cli_entry cli_file[] = {
 	AST_CLI_DEFINE(handle_cli_core_show_file_formats, "Displays file formats")
 };
 
+static void file_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_file, ARRAY_LEN(cli_file));
+}
+
 int ast_file_init(void)
 {
 	ast_cli_register_multiple(cli_file, ARRAY_LEN(cli_file));
+	ast_register_atexit(file_shutdown);
 	return 0;
 }
diff --git a/main/http.c b/main/http.c
index 62552529a97a551ed1f233ff8e2c4f9aaf6d8cff..44148edf8b158e6048b1ed973a520bbd2af4054c 100644
--- a/main/http.c
+++ b/main/http.c
@@ -1203,11 +1203,17 @@ static struct ast_cli_entry cli_http[] = {
 	AST_CLI_DEFINE(handle_show_http, "Display HTTP server status"),
 };
 
+static void http_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_http, ARRAY_LEN(cli_http));
+}
+
 int ast_http_init(void)
 {
 	ast_http_uri_link(&statusuri);
 	ast_http_uri_link(&staticuri);
 	ast_cli_register_multiple(cli_http, ARRAY_LEN(cli_http));
+	ast_register_atexit(http_shutdown);
 
 	return __ast_http_load(0);
 }
diff --git a/main/image.c b/main/image.c
index d3ca76f12f18b3a9c1fc911d4e4f6ff98eb68693..08620d734c1c9a24e99b3d832acfd3d01185cabc 100644
--- a/main/image.c
+++ b/main/image.c
@@ -206,8 +206,14 @@ static struct ast_cli_entry cli_image[] = {
 	AST_CLI_DEFINE(handle_core_show_image_formats, "Displays image formats")
 };
 
+static void image_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_image, ARRAY_LEN(cli_image));
+}
+
 int ast_image_init(void)
 {
 	ast_cli_register_multiple(cli_image, ARRAY_LEN(cli_image));
+	ast_register_atexit(image_shutdown);
 	return 0;
 }
diff --git a/main/stun.c b/main/stun.c
index a41dbac1003ad58969b78524ecf8bdd21ae9c834..3b4d2ad6b18e2964ba1086326541ce133a4123b1 100644
--- a/main/stun.c
+++ b/main/stun.c
@@ -504,8 +504,14 @@ static struct ast_cli_entry cli_stun[] = {
 	AST_CLI_DEFINE(handle_cli_stun_set_debug, "Enable/Disable STUN debugging"),
 };
 
+static void stun_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_stun, sizeof(cli_stun) / sizeof(struct ast_cli_entry));
+}
+
 /*! \brief Initialize the STUN system in Asterisk */
 void ast_stun_init(void)
 {
 	ast_cli_register_multiple(cli_stun, sizeof(cli_stun) / sizeof(struct ast_cli_entry));
+	ast_register_atexit(stun_shutdown);
 }
diff --git a/main/timing.c b/main/timing.c
index f2211d484d7b0faf8a032cff9d7bdefea59865ee..84bff081bd44d8feeb53e5157f306cb622e17bda 100644
--- a/main/timing.c
+++ b/main/timing.c
@@ -299,11 +299,21 @@ static struct ast_cli_entry cli_timing[] = {
 	AST_CLI_DEFINE(timing_test, "Run a timing test"),
 };
 
+static void timing_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_timing, ARRAY_LEN(cli_timing));
+
+	ast_heap_destroy(timing_interfaces);
+	timing_interfaces = NULL;
+}
+
 int ast_timing_init(void)
 {
 	if (!(timing_interfaces = ast_heap_create(2, timing_holder_cmp, 0))) {
 		return -1;
 	}
 
+	ast_register_atexit(timing_shutdown);
+
 	return ast_cli_register_multiple(cli_timing, ARRAY_LEN(cli_timing));
 }