diff --git a/AUTHORS b/AUTHORS
index a9ae4b0f..08661d40 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -95,3 +95,4 @@ reporting bugs, providing fixes, suggesting useful features or other:
 	ryanwilliamnicholls <https://github.com/ryanwilliamnicholls>
 	Dmitrii Ermakov <https://github.com/ErmakovDmitriy>
 	tarteens <https://github.com/tarteens>
+	Atzm WATANABE <https://github.com/atzm>
diff --git a/ChangeLog b/ChangeLog
index b044b785..69f8ba4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+05/23/2025
+- metrics: avoid possible segfault after restart twice
+
 05/17/2025
 - code: refactor util.c into util/ directory
 
diff --git a/src/metrics.c b/src/metrics.c
index 2620eb49..b227a1c7 100644
--- a/src/metrics.c
+++ b/src/metrics.c
@@ -879,6 +879,7 @@ apr_status_t oidc_metrics_cleanup(server_rec *s) {
 	apr_thread_join(&rv, _oidc_metrics_thread);
 	if (rv != APR_SUCCESS)
 		oidc_serror(s, "apr_thread_join failed");
+	_oidc_metrics_thread_exit = FALSE;
 	_oidc_metrics_thread = NULL;
 
 	/* delete the shared memory segment if we are in the parent process */