diff --git a/internal/metrics/register.go b/internal/metrics/register.go
index 51c3f97610..cb1d761bed 100644
--- a/internal/metrics/register.go
+++ b/internal/metrics/register.go
@@ -112,9 +112,8 @@ func (r *Runner) newOptions() (registerOptions, error) {
 		newOpts.pullOptions.disable = true
 	} else {
 		newOpts.pullOptions.disable = false
-		restclient.RegisterClientMetricsWithoutRequestTotal(metricsserver.Registry)
-		// Workqueue metrics are already registered in controller-runtime. Use another registry.
 		reg := prometheus.NewRegistry()
+		restclient.RegisterClientMetricsWithoutRequestTotal(reg)
 		workqueue.RegisterMetrics(reg)
 		newOpts.pullOptions.registry = metricsserver.Registry
 		newOpts.pullOptions.gatherer = prometheus.Gatherers{
diff --git a/release-notes/current.yaml b/release-notes/current.yaml
index 36bf1fd404..e630b04a7e 100644
--- a/release-notes/current.yaml
+++ b/release-notes/current.yaml
@@ -11,6 +11,7 @@ new features: |
   Added Gateway Listeners to the xDS listener metadata.
 
 bug fixes: |
+  Fixed an issue that controller panic when reloading configuration.
 
 # Enhancements that improve performance.
 performance improvements: |